OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e88e558 840c29e)
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)
am: 840c29eb0b

Change-Id: I197f09918da53af24dbdf73f514ede750129d4f6

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help