OSDN Git Service

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

1  2 
core/definitions.mk

Simple merge