OSDN Git Service

am c63d345b: am 264a5ed3: am 711951ab: am 78a819d6: am 266cf4f2: am f39752e9: Skip...
authorYing Wang <wangying@google.com>
Tue, 25 Mar 2014 21:31:59 +0000 (14:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 21:31:59 +0000 (14:31 -0700)
* commit 'c63d345b18235a989e473b8641851e5248977a5a':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS


Trivial merge