tree 8cff9da381c9f1d47f91117baf23d62aebdce290
parent 47bcb651180100c5f01c2d0d7c0ce023b970c247
parent 781a2f1a32fd6d68ec4a53afb007066655a85a78
author The Android Automerger <android-build@google.com> 1450386518 -0800
committer The Android Automerger <android-build@google.com> 1450386518 -0800

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