OSDN Git Service

am 266cf4f2: am f39752e9: Skip the product-scoped --product flag if it\'s set in...
authorYing Wang <wangying@google.com>
Mon, 24 Mar 2014 21:26:51 +0000 (21:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Mar 2014 21:26:51 +0000 (21:26 +0000)
* commit '266cf4f2595323170fe02db05835884b4522a0f9':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS

1  2 
core/definitions.mk

Simple merge