| commit | c93d39af9ad69de5f74ce2c2a53b67f745308c09 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Nov 11 00:13:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 00:13:46 2014 +0000 |
| tree | 861662ddb96f264209f8d8e03bdf86b1e302a6b6 | |
| parent | f093a88f26edc129db7caadae4dfbc45ffede995 [diff] | |
| parent | 461850dab19ea4b9552d079aa6c80f4bbbef6ab5 [diff] |
am 461850da: resolved conflicts for merge of 0a7fcb00 to lmp-mr1-dev * commit '461850dab19ea4b9552d079aa6c80f4bbbef6ab5': Introduce per-product per-module dex-preopt config