tree b177a9166aba5f7788f67c6953e1a8a32942bdf7
parent 6a45b5611fa101770c6641ddda1aa83fe47b74be
parent d26ba85011c38c2fce66fa4340ae468220f0d32a
author The Android Automerger <android-build@google.com> 1412082868 -0700
committer The Android Automerger <android-build@google.com> 1412082868 -0700

merge in lmp-mr1-release history after reset to 6a45b5611fa101770c6641ddda1aa83fe47b74be