OSDN Git Service
(root)
/
android-x86
/
hardware-interfaces.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2499a69
85e15db
)
Merge "libkeymaster1 was split into libkeymaster and _portable"
author
Janis Danisevskis
<jdanis@google.com>
Thu, 4 May 2017 16:16:39 +0000
(16:16 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 4 May 2017 16:16:45 +0000
(16:16 +0000)
1
2
keymaster/3.0/default/KeymasterDevice.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
keymaster/3.0/default/KeymasterDevice.cpp
Simple merge