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:
871a962
269aad5
)
am 269aad53: am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev
author
Sungsoo Lim
<sungsoo@google.com>
Mon, 5 Jan 2015 04:36:57 +0000
(
04:36
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 5 Jan 2015 04:36:57 +0000
(
04:36
+0000)
* commit '
269aad530493ccdd7ec78c1704eebd4476348b5d
':
DO NOT MERGE Make mute/unmute work
1
2
services/core/java/com/android/server/am/ActivityStack.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityStack.java
index
222f3f2
,
3f4749a
..
3ad7666
mode 100644,100755..100644
---
1
/
services/core/java/com/android/server/am/ActivityStack.java
---
2
/
services/core/java/com/android/server/am/ActivityStack.java
+++ b/
services/core/java/com/android/server/am/ActivityStack.java
OSDN Git Service
