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:
46be04f
e5c5113
)
resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp
author
Kenny Root
<kroot@google.com>
Thu, 19 May 2011 19:48:14 +0000
(12:48 -0700)
committer
Kenny Root
<kroot@google.com>
Thu, 19 May 2011 19:48:14 +0000
(12:48 -0700)
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
Trivial merge