tree a47ada7870666d00a4b1a5df6fea5dd56c9d9072
parent 4e5b7ad592fba5a8265e43455f2821d38cb26e77
parent 8d3096352caf669c013556ca0a434ab72ff47ced
author Nick Kralevich <nnk@google.com> 1439050569 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439050569 +0000

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

* commit '8d3096352caf669c013556ca0a434ab72ff47ced':