OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c724e8f
a82364c
)
resolved conflicts for merge of a82364c2 to master
author
Ben Murdoch
<benm@google.com>
Wed, 3 Feb 2010 11:21:01 +0000
(11:21 +0000)
committer
Ben Murdoch
<benm@google.com>
Wed, 3 Feb 2010 11:35:16 +0000
(11:35 +0000)
This is in conjunction with the frameworks/base rollback: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
The intent of these two changes is to avoid auto merging from MR2.
Change-Id: Idb5ba06a813fc547ebb45c6d251971a51cff3f0d
Trivial merge