tree 81096809194df7eea0f484b5d4b217e53a7a219d
parent 6aef04736294976b3bedaae5cb581a01f6387cc7
parent f846a4ea5d36889ccad94566d94bf2cdf5b02bde
author The Android Automerger <android-build@google.com> 1406207309 -0700
committer The Android Automerger <android-build@google.com> 1406207309 -0700

merge in lmp-release history after reset to 6aef04736294976b3bedaae5cb581a01f6387cc7