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:
2c372ef
1ee30f6
)
am 1ee30f6a: am 00758a3b: Merge "Some code clean-up." into mnc-dev
author
Wale Ogunwale
<ogunwale@google.com>
Wed, 29 Apr 2015 21:39:41 +0000
(21:39 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 29 Apr 2015 21:39:41 +0000
(21:39 +0000)
* commit '
1ee30f6a7f61c0f4ae79f9f7f6e829c96f91870f
':
Some code clean-up.
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