tree b2bf36c3f000da0e07698477c5859f099a08ea5a
parent bae8d7e64afedc973ff27881e37779810d24e48c
parent 5a71f83227f0340a265f34b226d8fe01d4dd9773
author Bill Yi <byi@google.com> 1414378236 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414378236 +0000

am 5a71f832: (-s ours) Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master

* commit '5a71f83227f0340a265f34b226d8fe01d4dd9773':