tree b07c462e7d3506511a2ea2414b586e56efc831cb
parent 720d9297f72f8b5c006ff46e7cb69f2e1d4b641f
parent c3ec47f15fe8fca4dc1aa1701d43fc155a2a6fdf
author The Android Automerger <android-build@google.com> 1407330505 -0700
committer The Android Automerger <android-build@google.com> 1407330505 -0700

merge in lmp-release history after reset to 720d9297f72f8b5c006ff46e7cb69f2e1d4b641f