tree 3c42ac947ff22fb43565ee6e5d47f9b38f649344
parent 39b32b0d1f0e016ee99830e5ef4c165a7e0576ce
parent d4829a016e19241a0ae902031cf1b94e303c80a2
author The Android Automerger <android-build@google.com> 1440316916 -0700
committer The Android Automerger <android-build@google.com> 1440316916 -0700

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