tree a931998cf2b0e2d80cc2da5ef1f5454dd77bedda
parent f35042d850c2a056c937a1140a6462dd6411279b
parent abc947462a3471a4d665d8a76823700fd5dfe170
author The Android Automerger <android-build@google.com> 1414588257 -0700
committer The Android Automerger <android-build@google.com> 1414588257 -0700

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