am 2d17b1ab: resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp

Browse Source

* commit '2d17b1aba6ea529dc618d50c784f69fb7f1a8141':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm

...

This commit is contained in:

Elliott Hughes

2012-10-03 12:19:35 -07:00

committed by Android Git Automerger

parent 71eef22e4a 2d17b1aba6

commit 0b89c64fc4

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files