tree 2add03c6beb4ec773b475318abd92a5d9d2265f6
parent 4a61fbd43d17ace5995560761263326b1df7a4ec
parent 5274dd174e6f83f808662be3e5aecd30e21c1e0a
author The Android Automerger <android-build@google.com> 1416838430 -0800
committer The Android Automerger <android-build@google.com> 1416838430 -0800

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