tree ce303b613ccd9db6544f33b29920c35f6267d753
parent 760623a499683d3e9015d997729627b786ffb9d0
parent aab7a4146ccd14f94ac87f4c52895f1bb5d37645
author Rubin Xu <rubinxu@google.com> 1487209001 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487209006 +0000

Merge "Add escrow token API in DevicePolicyManager."