tree d3976925d92ef43c95f53feb00db0001d640ff71
parent 9f7c25ebeba866d0db696f5db0d29fa8c6a86768
parent a151400f5f66673a3d83b6fec39585d4a807fa9e
author The Android Automerger <android-build@google.com> 1406034553 -0700
committer The Android Automerger <android-build@google.com> 1406034553 -0700

merge in lmp-release history after reset to a792fc8a027d84e91879b9204c901ee0fc3eaee8