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:
3912a86
a5eebbd
)
resolved conflicts for merge of 267a6181 to honeycomb-LTE
author
Irfan Sheriff
<isheriff@google.com>
Wed, 22 Jun 2011 05:46:51 +0000
(22:46 -0700)
committer
Irfan Sheriff
<isheriff@google.com>
Wed, 22 Jun 2011 14:11:42 +0000
(07:11 -0700)
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
Trivial merge