tree ec814361b0b288ca7cc9090780073b1973235e0a
parent d8bb1ec9efccbbcc48d8d4991c9d4001fa31eeb5
parent f92db8d837f339afcac58b472e1600b0b429f61a
author The Android Automerger <android-build@google.com> 1436223781 -0700
committer The Android Automerger <android-build@google.com> 1436223781 -0700

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