tree 13cc4ca445421ccc4679f03262098bbfe1043027
parent 1767df778e20c1395afc63b3a0479bd903e7b9f0
parent 98a8d057f6d72d4d0a018b4ba9532beed083a299
author The Android Automerger <android-build@google.com> 1418220624 -0800
committer The Android Automerger <android-build@google.com> 1418220624 -0800

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