tree 2615ef923afb3c1c0dbc4c476e8db2581a7ec3e2
parent 6fd987be1e3b802adb89b0b118b2aff8c4fc5423
parent a23e196f2b283b2ea9d449ce72009541177d6914
author The Android Automerger <android-build@google.com> 1436601669 -0700
committer The Android Automerger <android-build@google.com> 1436601669 -0700

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