tree 5f4d0e120e32c9c1f6d919c345c4355d563b6993
parent 02a966993ce283bfaf3078865b0f684d280db249
parent fcd1204b4b96574dbf61c7029dbfaf27844b9744
author The Android Automerger <android-build@google.com> 1436861162 -0700
committer The Android Automerger <android-build@google.com> 1436861162 -0700

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