OSDN Git Service

Merge "Rename trustedUserPresenceRequired." into pi-dev
authorShawn Willden <swillden@google.com>
Tue, 3 Apr 2018 00:43:45 +0000 (17:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 00:43:45 +0000 (17:43 -0700)
commit7d64fc41413a511b78e6e80dd5d7c907be828b8c
tree9e4d1f66c7442d457aae7b4fa21c356460cb781e
parente88e5584849c5d95d2f1ec4abfbcdf1d8f691a23
parent840c29eb0be73a875c883863cf1421ca789f7041
Merge "Rename trustedUserPresenceRequired." into pi-dev
am: 840c29eb0b

Change-Id: I197f09918da53af24dbdf73f514ede750129d4f6
api/current.txt