tree eab7578d39f3b1b3d5e2876ff5dc19b773127379
parent 2377084c0d37d321e9bb3fd4677e76041f137931
parent 4dfb5580c2e33eebda24e377c5ce2a73a93d4258
author Ying Wang <wangying@google.com> 1406753452 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406753452 +0000

am 4dfb5580: Merge "Don\'t apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set" into lmp-dev

* commit '4dfb5580c2e33eebda24e377c5ce2a73a93d4258':
  Don't apply PRODUCT_AAPT_PREF_CONFIG if LOCAL_PACKAGE_SPLITS is set