tree c9403de521eb69e7d2135569b1af9194a683bf41
parent b3759712b0ab4ae294731ee5889c2ebd131a156f
parent 4f25575492933bac5360ce23a68680c378160458
author The Android Automerger <android-build@google.com> 1438848200 -0700
committer The Android Automerger <android-build@google.com> 1438848200 -0700

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