tree 6c41e615017e0aab87f5075eb205b22fe61281af
parent 560afffdb6f203f6d3dce0a116b04231f8414729
parent 5bf7b39db0dfa4496f687f2a53d87beefe06e10a
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516669898 +0000
committer android-build-merger <android-build-merger@google.com> 1516669898 +0000

[automerger] Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 am: 4fb8b88d7e am: ecb97ccaaf am: db91a8fa89  -s ours am: aab3a41aff am: 98eb42dbf9
am: 5bf7b39db0

Change-Id: I0c8219ee734d9116740152294c78e964ceccc7a1