OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1b2e5c1
dcdaf87
)
Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev
author
Alex Klyubin
<klyubin@google.com>
Thu, 14 May 2015 15:51:00 +0000
(15:51 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 14 May 2015 15:51:01 +0000
(15:51 +0000)
1
2
core/java/android/hardware/fingerprint/FingerprintManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/hardware/fingerprint/FingerprintManager.java
Simple merge