tree 648b1d3d905516553b8a4d7062ab5a96d317d54b
parent 333cd4daa66bf6c02275646dd20effc06de54e87
parent b383732968820acb8b688d20ad1ef448f90fe73d
author Sander Alewijnse <salewijnse@google.com> 1426893150 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426893150 +0000

am b3837329: am 5514bab6: am 01e00975: Merge "Refactor the provisioning intent generation for device owner." into lmp-dev

* commit 'b383732968820acb8b688d20ad1ef448f90fe73d':