Commits
Andreas Gampe authored and Android Git Automerger committed baa73b056cbM
am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp * commit 'cba06c2272c8bce7d10b2a7ee762d12043f3252a': Frameworks/base: Wall Werror in media/jni
Showing diff tocbaa1c617b6