tree 9e3cabeefbab2dab15838746f47e3f7fcdfc8651
parent 3840033f0802d38d11ef201a33e29bd8e201f351
parent 5e7bb42f51b0ad3b3db912a7b1dbf8b4acb364a1
author Sachiyo Sugimoto <sachiyo@google.com> 1516130317 +0000
committer android-build-merger <android-build-merger@google.com> 1516130317 +0000

Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d
am: 5e7bb42f51

Change-Id: Ie09922f02db351699b2c39b812996f131e71f404