OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba34889 c354b89)
am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled...
authorJim Miller <jaggies@google.com>
Tue, 8 Jun 2010 02:25:49 +0000 (19:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Jun 2010 02:25:49 +0000 (19:25 -0700)
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.


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