tree cae82eb62ed5e65b74eb1cc8870b5007d9864571
parent 4a542d96a9ce1fc8b567eb853dac0baea64505a1
parent f61b9b88e2f6fabad2a7d1edbc91e19bb7ef98d5
author The Android Automerger <android-build@google.com> 1415283433 -0800
committer The Android Automerger <android-build@google.com> 1415283433 -0800

merge in lmp-mr1-release history after reset to 4a542d96a9ce1fc8b567eb853dac0baea64505a1