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:
8658e1a
814f5ac
)
resolved conflicts for merge of 814f5ac3 to jb-mr1-dev
author
Amith Yamasani
<yamasani@google.com>
Mon, 24 Sep 2012 16:26:37 +0000
(09:26 -0700)
committer
Amith Yamasani
<yamasani@google.com>
Mon, 24 Sep 2012 16:26:37 +0000
(09:26 -0700)
Change-Id: Ic65395ce932971dc9c37a481aa96da79a45d0f12
1
2
services/java/com/android/server/SystemServer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/SystemServer.java
Simple merge
OSDN Git Service
