tree e8ad34c136ad6c8fd283aaee582e0e2cef0d0f77
parent d167d5eabc794ba4ddef1a2900eb729720da84a2
parent f5fe5c5769aad35cd92ecf5b8b80fada201429f1
author The Android Automerger <android-build@google.com> 1450386518 -0800
committer The Android Automerger <android-build@google.com> 1450386518 -0800

merge in mnc-mr1-release history after reset to mnc-dr-dev