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:
0e9667a
4cc49f7
)
Merge "Add configurable ignore-list for acquired messaging" into qt-dev
author
Kevin Chyn
<kchyn@google.com>
Thu, 2 May 2019 01:54:05 +0000
(
01:54
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 2 May 2019 01:54:05 +0000
(
01:54
+0000)
1
2
core/res/res/values/config.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/biometrics/face/FaceService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/res/res/values/config.xml
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
services/core/java/com/android/server/biometrics/face/FaceService.java
Simple merge
diff --cc
services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
Simple merge