tree 81f6f1b076d932a74578012f45e525c517c823b0
parent 44a06cae629e2ab3b6519f21e5dce82006d76e83
parent ff246059fcf6d2071558ba490d30256e1e56e153
author Nick Kralevich <nnk@google.com> 1439054094 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439054094 +0000

am ff246059: am 5fc6ca11: 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 'ff246059fcf6d2071558ba490d30256e1e56e153':