tree 4f266f84861151cdb5c2cc9bf4b8b77f6b209a24
parent 47da905183b4e2ec50eb16c75852d68b558c7c1e
parent 7eee60704c918660e4bd37eb94e0829c7882f59f
author The Android Automerger <android-build@google.com> 1423577550 -0800
committer The Android Automerger <android-build@google.com> 1423577550 -0800

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