tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 3a77916ff03db2035fc374181f0a56b622fa738f
parent 371ab9058e923679e7dd451bc8351e6e0ce0c3b0
author Tao Bao <tbao@google.com> 1440684834 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684834 +0000

am 371ab905: am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp

* commit '371ab9058e923679e7dd451bc8351e6e0ce0c3b0':