tree ee9ba00ba4ef335a2e36c4b18420516cd4f66c89
parent e2547c3bffbbd03d6512de145a7f563d83d6fb9e
parent 6aa2c51291549b2cfa92ff9e8693f4f4af37450b
author The Android Automerger <android-build@google.com> 1417702240 -0800
committer The Android Automerger <android-build@google.com> 1417702240 -0800

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