merge in lmp-release history after reset to 536e4e87d6da73a1a511a43dfcf40a338c3735e5
authorThe Android Automerger <android-build@google.com>
Sun, 5 Oct 2014 13:13:30 +0000 (06:13 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 5 Oct 2014 13:13:30 +0000 (06:13 -0700)
commitc1cd969cdc28dfda9877a98f10a6b06b1ac6c91c
tree83d56d5766fcdaded24935f3dc07b40b20299be9
parent536e4e87d6da73a1a511a43dfcf40a338c3735e5
parent84dee052ebecd0bfb22596ed0a0f893b840dda0b
merge in lmp-release history after reset to 536e4e87d6da73a1a511a43dfcf40a338c3735e5