tree f596c47e6d82434db51fd23f08616c32bcd33b5e
parent b8072def7ec8ca5bbbee40bcfb4db8eca74115fb
parent 9472fe170bbceb401b1997c824b8d2addbdea80d
author The Android Automerger <android-build@google.com> 1418134180 -0800
committer The Android Automerger <android-build@google.com> 1418134180 -0800

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