OSDN Git Service

Merge "Added an onDeviceUnlockLockout callback to TrustAgentService."
authorZac Iqbal <zacharyi@google.com>
Sat, 21 Jan 2017 01:35:39 +0000 (01:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 21 Jan 2017 01:35:43 +0000 (01:35 +0000)
1  2 
api/system-current.txt

Simple merge