| commit | f9c93d7cbdedfa9dc5f404c14862e18f9bbb773e | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Nov 19 00:33:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 19 00:33:48 2014 +0000 |
| tree | 135134e086d0ec6e058ea6f9788dc7039bd8601e | |
| parent | 1dbaf506f46d94d0d54e03e67fb7a8c5c2001bc4 [diff] | |
| parent | 0217e3b20b6a331b0820014dc136d782070bca45 [diff] |
am 0217e3b2: resolved conflicts for merge of a4f415d6 to lmp-mr1-dev-plus-aosp * commit '0217e3b20b6a331b0820014dc136d782070bca45': Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG