tree 8b5b502e844e80b0d049d93f76af5eff258bb48f
parent f7063c1e913edebd3402a2c2467c1bdb3d4b79a9
parent aec53143cea679ae34d0f864f1c1742efabf24f8
author The Android Automerger <android-build@google.com> 1436223751 -0700
committer The Android Automerger <android-build@google.com> 1436223751 -0700

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