tree 5bc92de6f453a0652b1965bdc90e8a78a42a1fcc
parent 66270b69d4a01f921106588912a492f15fe0d9f4
parent 967b52fb0b4589275d347f8e76bd3fcc9bb209a4
author Tao Bao <tbao@google.com> 1440651753 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440651753 +0000

am 967b52fb: (-s ours) am afc5ab39: am c6e087ad: resolved conflicts for merge of 2bcfbe7e to lmp-mr1-ub-dev

* commit '967b52fb0b4589275d347f8e76bd3fcc9bb209a4':