merge in lmp-release history after reset to 536e4e87d6da73a1a511a43dfcf40a338c3735e5
authorThe Android Automerger <android-build@google.com>
Mon, 6 Oct 2014 13:14:10 +0000 (06:14 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 6 Oct 2014 13:14:10 +0000 (06:14 -0700)
commita7af0ea689227eeaa5f1c6db6676a126778cf58f
tree83d56d5766fcdaded24935f3dc07b40b20299be9
parent536e4e87d6da73a1a511a43dfcf40a338c3735e5
parentc1cd969cdc28dfda9877a98f10a6b06b1ac6c91c
merge in lmp-release history after reset to 536e4e87d6da73a1a511a43dfcf40a338c3735e5