tree a24532894df315dbde586571aab2e9a40c163781
parent 0ba5a4998cd7612c762fa51cf67c13892c44584b
parent 6171dd16a939100eb520f332c0a5c91c4635985e
author The Android Automerger <android-build@google.com> 1417097698 -0800
committer The Android Automerger <android-build@google.com> 1417097698 -0800

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