tree 4682677214940bc64e92d68cc30aeeae0c701ad4
parent 4f262a753289fe1b50f71d3ed74deb588c17edcd
parent 8dca43f7f084e8eceef80b78e9105edbbb8d8564
author The Android Automerger <android-build@google.com> 1415549103 -0800
committer The Android Automerger <android-build@google.com> 1415549103 -0800

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