tree bc5490f54bc0660041ae59155620af29777762bb
parent 16d0b4cff1b643ee6bb70a3cf4541f34c4bc2210
parent d03438e18a35d25c9f91d743a7884ec27c43c90f
author The Android Automerger <android-build@google.com> 1438675250 -0700
committer The Android Automerger <android-build@google.com> 1438675250 -0700

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