OSDN Git Service

resolved conflicts for merge of 24e276c8 to master
authorNicolas Roard <nicolas@android.com>
Fri, 11 Mar 2011 23:54:02 +0000 (15:54 -0800)
committerNicolas Roard <nicolas@android.com>
Fri, 11 Mar 2011 23:54:02 +0000 (15:54 -0800)
commitf3a31eb2e1d301a9ceb62e99250c1d5e19814c66
treebaab716fe6f898d383404db07f13b9f447fee191
parent2dd2637428709f3c4cced21e274798afb2233fae
parent24e276c8e5227205806807e70f5774218c0c0d1f
resolved conflicts for merge of 24e276c8 to master

Change-Id: I1f46d4444330bf7e03b99a5d0089e9388b9ea8bd
WebCore/platform/android/RenderThemeAndroid.cpp
WebKit/android/RenderSkinMediaButton.cpp