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:
80ed035
fcefeb2
)
Merge "Work on issue #78480444: Start tracking uid state in app ops" into pi-dev
author
Dianne Hackborn
<hackbod@google.com>
Wed, 25 Apr 2018 21:11:58 +0000
(14:11 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 25 Apr 2018 21:11:58 +0000
(14:11 -0700)
am:
fcefeb25ac
Change-Id: I11aee7e90d9ce9680933e2d3433a0159513c435c
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