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:
7b63107
476ceb8
)
resolved conflicts for merge of a7f68230 to master
author
Robert Greenwalt
<rgreenwalt@google.com>
Mon, 25 Jul 2011 23:06:25 +0000
(16:06 -0700)
committer
Robert Greenwalt
<rgreenwalt@google.com>
Mon, 25 Jul 2011 23:06:25 +0000
(16:06 -0700)
Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9
Trivial merge