OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 746c608 b00540d)
am b00540dc: am e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecu...
authorAdrian Roos <roosa@google.com>
Wed, 29 Apr 2015 22:22:17 +0000 (22:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Apr 2015 22:22:17 +0000 (22:22 +0000)
* commit 'b00540dc5c2d475fd6a6833f1a805cb0a683e264':
  Clarify javadoc of isKeyguardSecure and isDeviceSecure


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help