tree 8bf0d50932ded88f2208b0796b7386f3408ebf64
parent b24ce1b602f80a3887e0af0bb4bac886ef4a5358
parent 19b81454479b2f6c438593304cd8c8f4c9ca77bc
author Ying Wang <wangying@google.com> 1459287568 +0000
committer android-build-merger <android-build-merger@google.com> 1459287568 +0000

Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev
am: 19b8145

* commit '19b81454479b2f6c438593304cd8c8f4c9ca77bc':
  Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt

Change-Id: I4ebd15e849f5dd2c57c4e8679d140f184f999fa1