tree f3ae81c140bcc5adf6a0cef138f50b006907d746
parent 95e2ff62d197479d3510c255d87c82ab185e2e4b
parent 814d1938f091d311c709bc714c2d31032d43d7bc
author Matt Sarett <msarett@google.com> 1440707902 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440707902 +0000

am 814d1938: am b1df2577: (-s ours) resolved conflicts for merge of ab10e256 to mnc-dev-plus-aosp

* commit '814d1938f091d311c709bc714c2d31032d43d7bc':