| commit | baa73b056cbd4627a84b39a6267065ae56677220 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Nov 11 04:02:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 04:02:22 2014 +0000 |
| tree | d8a2847582ae788e58ee2d8f70b8212010a0fc55 | |
| parent | cbaa1c617b6783bc8fa8275327d077fa2bcec97a [diff] | |
| parent | cba06c2272c8bce7d10b2a7ee762d12043f3252a [diff] |
am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp * commit 'cba06c2272c8bce7d10b2a7ee762d12043f3252a': Frameworks/base: Wall Werror in media/jni