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

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