tree 2c521ba3ef7c1db050893c564c18c5492a0e28e7
parent 0ea63e0cbd974863f9c828951d3a9228de962db6
parent b106db64e8d3c6807c06b65db474e073044f3002
author The Android Automerger <android-build@google.com> 1406034519 -0700
committer The Android Automerger <android-build@google.com> 1406034519 -0700

merge in lmp-release history after reset to 0ea63e0cbd974863f9c828951d3a9228de962db6