tree 8caaf549b82fc57b83789692759447d3733ac598
parent 7e2974ac4d80526a4dc38e0ce5a6d3484536284a
parent dde3f936172f094c77750650acbe24cd833d27ab
author The Android Automerger <android-build@google.com> 1422972535 -0800
committer The Android Automerger <android-build@google.com> 1422972535 -0800

merge in lmp-mr1-release history after reset to lmp-mr1-dev