tree 05c3cc9e4bc0c74e4d238aeceb5d3c1c894a78c3
parent 203eed2908adee6aa85a9b0e5b983968cddf631e
parent c08b557dccce032b24c88de5fa58ebc424554834
author The Android Automerger <android-build@google.com> 1450386509 -0800
committer The Android Automerger <android-build@google.com> 1450386509 -0800

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