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:
3aab22c
11866a4
)
Merge "Hide activities when AOD comes in" into pi-dev
author
Lucas Dupin
<dupin@google.com>
Wed, 28 Mar 2018 01:26:42 +0000
(
01:26
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 28 Mar 2018 01:26:42 +0000
(
01:26
+0000)
am:
11866a4242
Change-Id: I7b4524fb00fbd394c7e0794f052f394c1aad5460
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