Commits
Dan Albert authored and Android Git Automerger committed 4bac6e11aefM
am 3a091b79: resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp * commit '3a091b79978caa9b5d58ae19f693279e5a717c2a': Fix clang warnings in core/jni.
Showing diff to2670d5ad59f