tree 110ab28acc4976aa8ad873687207793bc145630e
parent c5825853c55d219032257b85a56cb105c257bdf0
parent 4dec9d0da96c4bb8e8c138109ec8f60197f5095e
author Nick Kralevich <nnk@google.com> 1439051329 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439051329 +0000

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

* commit '4dec9d0da96c4bb8e8c138109ec8f60197f5095e':