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:
7d710b9
f78b8ce
)
Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
author
Jeff Sharkey
<jsharkey@google.com>
Mon, 16 Apr 2018 17:19:39 +0000
(10:19 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 16 Apr 2018 17:19:39 +0000
(10:19 -0700)
am:
f78b8ce258
Change-Id: Ie9bcdc9736c04ab787efc193311a20d03718b593
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
OSDN Git Service
