tree a0c0b139f076bf3ffc92182d38ee4f8e3dd62c30
parent d886ba21b1f9f9ccd0dd0fab17f58d280470f7b1
parent d7138ba4bf0d0201cceebfd6c5d27585870a7b5f
author Nick Kralevich <nnk@google.com> 1439053314 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439053314 +0000

am d7138ba4: am 6ab0f7a9: am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit 'd7138ba4bf0d0201cceebfd6c5d27585870a7b5f':