tree cfea201952e0a843d5ad787dc038a368c911d94d
parent d50fb05c6c700b12ae42193a4e662b8f7b9592e9
parent 0d95d4addaa17137d7fbd0f321b8e2a669b4c22f
author Unsuk Jung <unsuk@google.com> 1442051111 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442051111 +0000

am 0d95d4ad: resolved conflicts for 5365cd9e to lmp-mr1-dev

* commit '0d95d4addaa17137d7fbd0f321b8e2a669b4c22f':