| commit | 054262cbca1242dc7772ac41328bfb5570aac966 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Oct 02 06:33:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 06:33:22 2014 +0000 |
| tree | 850015112aba37880070a5d39ef027211e19e70d | |
| parent | ce324a2da796e74cabc43de996055e9bb4828e44 [diff] | |
| parent | 87332a7109610d02ac7f5db6af99d3a11813d5c1 [diff] |
am 87332a71: resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp * commit '87332a7109610d02ac7f5db6af99d3a11813d5c1': Frameworks/base: Fix AAPT warnings