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:
f4876d1
a55a662
)
Merge "Fix ordering of notifying dismiss callback" into oc-dev am: e85f8eb0ca
author
Jorim Jaggi
<jjaggi@google.com>
Thu, 18 May 2017 22:47:12 +0000
(22:47 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 18 May 2017 22:47:12 +0000
(22:47 +0000)
am:
a55a662600
Change-Id: Ic24eaca241ddc2c84395a1d2bdaf6dd554b0e55b
1
2
services/core/java/com/android/server/trust/TrustManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/trust/TrustManagerService.java
Simple merge
OSDN Git Service
