tree da899001721fa4c509f058b798648986a04b7cd1
parent d809de884761f290a94f01f21b5c94e262ec22ea
parent 85aa7bbdeacef5c20f89f02ad2ae512d7888d545
author The Android Automerger <android-build@google.com> 1440057908 -0700
committer The Android Automerger <android-build@google.com> 1440057908 -0700

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