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:
339dd0a
30a4388
)
DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3
author
Jeff Sharkey
<jsharkey@android.com>
Fri, 3 Feb 2017 00:18:38 +0000
(
00:18
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 3 Feb 2017 00:18:38 +0000
(
00:18
+0000)
am:
30a4388481
Change-Id: I5088038dbd457b7d2314a014da11ebd14192a211
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