tree 53965f67a6cc18d721f688c14b9a3c08e8736995
parent 2235ef28ade5021c9216331519832ca05c93f652
parent 6ab0f7a9196c3d1fc7676970febb364395c9f050
author Nick Kralevich <nnk@google.com> 1439052954 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439052954 +0000

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 '6ab0f7a9196c3d1fc7676970febb364395c9f050':