tree ed34ef48b170584425b0e7f37639bdfa2a2a341c
parent 507ea383aaaea5634c79d20911773aa44324e7f5
parent b5547a97bab374a2a247043e0fdad38b3533de59
author The Android Automerger <android-build@google.com> 1422281364 -0800
committer The Android Automerger <android-build@google.com> 1422281364 -0800

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