OSDN Git Service

Merge commit '2d50524'
authorMike Lockwood <lockwood@google.com>
Wed, 21 Mar 2012 23:58:35 +0000 (16:58 -0700)
committerMike Lockwood <lockwood@google.com>
Wed, 21 Mar 2012 23:58:40 +0000 (16:58 -0700)
commit3c05c2fee8982a6a05f7292de547f298690f2118
tree7091d788a425cf82eea6a88449fad785ac2b71a8
parentb5494f5b75b358b20d87ee68897548f5c459da1d
parent2d50524a0164072d0cf3f60108d0a2227d4cabc1
Merge commit '2d50524'

empty -s ours merge to skip change:

    main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS

Change-Id: Id79485ba1c5ddae222e4d7bedb05efadff168f00