tree df6f1f58eab53a68889e8687c69770a5a2934c0c
parent 1f359d76e96cc569fad38940429641fe0416cc1e
parent 841ab0c43d4540b8dd29fe1c03c50e931cbffe27
author The Android Automerger <android-build@google.com> 1436688165 -0700
committer The Android Automerger <android-build@google.com> 1436688165 -0700

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