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:
709305e
de44ac3
)
resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp
author
Robert Greenwalt
<rgreenwalt@google.com>
Wed, 27 Jul 2011 16:27:00 +0000
(09:27 -0700)
committer
Robert Greenwalt
<rgreenwalt@google.com>
Wed, 27 Jul 2011 16:27:00 +0000
(09:27 -0700)
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
Trivial merge