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:
1a7d98b
3da5c97
)
Merge "Adjusting AMN#requestBugReport() to be able to invoke 3 types of bugreport...
author
Michal Karpinski
<mkarpinski@google.com>
Fri, 8 Jan 2016 18:00:18 +0000
(18:00 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 8 Jan 2016 18:00:18 +0000
(18:00 +0000)
1
2
core/java/android/app/ActivityManager.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/app/ActivityManagerNative.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/app/IActivityManager.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/ActivityManager.java
Simple merge
diff --cc
core/java/android/app/ActivityManagerNative.java
Simple merge
diff --cc
core/java/android/app/IActivityManager.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge