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:
054bed5
46656fa
)
Merge "Hidden API blacklisting killswitch."
author
Mathew Inwood
<mathewi@google.com>
Fri, 16 Feb 2018 16:31:26 +0000
(16:31 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 16 Feb 2018 16:31:26 +0000
(16:31 +0000)
am:
46656fa28e
Change-Id: I1276e1eb5b2d4438ebc6f071ed28f1f322a8bc6e
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge