tree fb4d161294b6eda668134b7a20957bc532f47181
parent c660ddcb0b6e562f9386464eabc986ad2f1e50b5
parent 1662fa38086eb3015d5f2bd99135ad16fd8639ce
author Rubin Xu <rubinxu@google.com> 1426685919 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426685919 +0000

Merge "Fix a race condition in DeviceOwnerProvisioningService"