| commit | 1c0668a3f809fcbb6e499b9c7866b5f75af42479 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 07 23:17:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 07 23:17:40 2014 +0000 |
| tree | 5b8e8e4712a2674fc2fc98a2d108781b6c3c7b11 | |
| parent | 560893ce53da1579a9b72650f1c798e030572eb8 [diff] | |
| parent | 83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55 [diff] |
am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp * commit '83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55': Frameworks/base: Wall Werror in libs/androidfw