tree 627d4a787295a62adb44428ed0602811b3dc474e
parent 3f9f6f42bd459fb30e8388dee0ae1d3d986488e9
parent 4b8545b3fbd713c9b17555d0d075a6a402cedb71
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582154064 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582154064 +0000

Merge "Rename ro.device_owner system property" am: 075c6b9db7 am: 3cf8f19dc4 am: 4b8545b3fb

Change-Id: Iad0b91c0b37e1e4c22ea3b2754b96e21b3fa427b