tree db58d4edd4e0407ce8076bf3f6c9819e8f882649
parent 231406d597cca1c9c009f870fbb62e46b8475186
parent 9e8cf8e5712fedb021ad5c679709e1629f8df11a
author The Android Automerger <android-build@google.com> 1422454170 -0800
committer The Android Automerger <android-build@google.com> 1422454170 -0800

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