tree c2f223e15c28217ee897616ad9e0ff0c91416e79
parent 4cbc4b392da57c34626af38a4ea0fe4dc115af57
parent dbf0141086becbbcd759bcc332fdbe83fb5d4214
author The Android Automerger <android-build@google.com> 1426683920 -0700
committer The Android Automerger <android-build@google.com> 1426683920 -0700

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