tree a835ea35366d25be808bf223881309d3b6fb1a93
parent bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82
parent f39752e99b4e5083f1e91c46722f87def8143b49
author Ying Wang <wangying@google.com> 1395696086 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395696086 +0000

am f39752e9: Skip the product-scoped --product flag if it\'s set in LOCAL_AAPT_FLAGS

* commit 'f39752e99b4e5083f1e91c46722f87def8143b49':
  Skip the product-scoped --product flag if it's set in LOCAL_AAPT_FLAGS