OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25418aa 50bfeec)
Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev
authorAdrian Roos <roosa@google.com>
Thu, 20 Nov 2014 21:38:12 +0000 (21:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Nov 2014 21:38:14 +0000 (21:38 +0000)
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