OSDN Git Service

Merge "Rename trustedUserPresenceRequired." into pi-dev am: 840c29eb0b
authorShawn Willden <swillden@google.com>
Tue, 3 Apr 2018 02:40:18 +0000 (19:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 02:40:18 +0000 (19:40 -0700)
am: 7d64fc4141

Change-Id: If6d9e3674fa75f4383a4d2ddc12612ed2f8e452b

1  2 
api/current.txt

diff --cc api/current.txt
Simple merge