tree 5ad160739e0857d70a517cf52c9da4376160e160
parent bce1889b8922fbbc2695756d3723029d4fd4cf66
parent 43f7a3226afd3439b9e83c05606d14e3766381cc
author Ying Wang <wangying@google.com> 1416356333 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1416356334 +0000

Merge "Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev