OSDN Git Service

am b4cd156b: am 4dfb5580: Merge "Don\'t apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKA...
authorYing Wang <wangying@google.com>
Wed, 30 Jul 2014 20:55:28 +0000 (20:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Jul 2014 20:55:28 +0000 (20:55 +0000)
* commit 'b4cd156bb2946bb074be6afcfb6c905ed35334ef':
  Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set


Trivial merge