tree 28348d38502cdad181beaf909e2bffa6f7ec5cd2
parent 96f2bc51002a59fb77711a2a38e014cf13ac010c
parent a0025a89738fb8cca1eddb75f85e2e57266f0cbf
author The Android Automerger <android-build@google.com> 1436861200 -0700
committer The Android Automerger <android-build@google.com> 1436861200 -0700

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