tree e939c1f414eb91b8cc984b564c25e4e4be864f63
parent 5a08eb07335110042f1dab2fee28f899acceeb2e
parent b16ef69d94b526e11163321b456a81f9a3c50f9a
author The Android Automerger <android-build@google.com> 1420738412 -0800
committer The Android Automerger <android-build@google.com> 1420738412 -0800

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