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

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