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:
ef25597
27c39f1
)
Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp...
author
Andreas Gampe
<agampe@google.com>
Thu, 30 Apr 2015 17:53:48 +0000
(17:53 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 30 Apr 2015 17:53:51 +0000
(17:53 +0000)
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
