tree bc74410daf5478dcb66b60c590aaf3014d68e871
parent 86d4fddb20008aa7dddbbc3d8374088352f7f256
parent 38134dfcf1f3e6b74ddf28f4d92a1798287891e6
author The Android Automerger <android-build@google.com> 1423145333 -0800
committer The Android Automerger <android-build@google.com> 1423145333 -0800

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