tree b792e5a28bd0e78c245b45fbf21567834ebbc737
parent a5bcb401f154ddf05017ee13d6ae7e4774fd3107
parent ecea4711c516f51af5ed2dd83d0febb3574470be
author The Android Automerger <android-build@google.com> 1411651087 -0700
committer The Android Automerger <android-build@google.com> 1411651087 -0700

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