tree d7206fe82906cff3a8bfce1073dc4aeeba976219
parent 91a75a3a823a0f33460fb1271ae9141c6a7bca17
parent 78223aa37c5e7fba11d84a9f12b6cb7dd7ad3fcf
author Suprabh Shukla <suprabh@google.com> 1470797339 +0000
committer android-build-merger <android-build-merger@google.com> 1470797339 +0000

Merge "Fixing admins not being removed from DpmMockContext" into nyc-mr1-dev am: 521e27d652
am: 78223aa37c

Change-Id: Ibcd5967decd1b694d31b2a2fecc59e4c6ae87409