OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
802c5d0
0938c36
)
resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp
author
Jeff Hamilton
<jham@android.com>
Fri, 14 Jan 2011 06:38:31 +0000
(
00:38
-0600)
committer
Jeff Hamilton
<jham@android.com>
Fri, 14 Jan 2011 06:38:31 +0000
(
00:38
-0600)
Change-Id: Ia7071ca07d917bd79e7697f4b0c0640ebb5f6a6f
Trivial merge