| commit | 3c05c2fee8982a6a05f7292de547f298690f2118 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@google.com> | Wed Mar 21 16:58:35 2012 -0700 |
| committer | Mike Lockwood <lockwood@google.com> | Wed Mar 21 16:58:40 2012 -0700 |
| tree | 7091d788a425cf82eea6a88449fad785ac2b71a8 | |
| parent | b5494f5b75b358b20d87ee68897548f5c459da1d [diff] | |
| parent | 2d50524a0164072d0cf3f60108d0a2227d4cabc1 [diff] |
Merge commit '2d50524'
empty -s ours merge to skip change:
main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS
Change-Id: Id79485ba1c5ddae222e4d7bedb05efadff168f00