OSDN Git Service

resolved conflicts for merge of 43edd45c to master
authorNicolas Roard <nicolas@android.com>
Sat, 12 Mar 2011 00:39:37 +0000 (16:39 -0800)
committerNicolas Roard <nicolas@android.com>
Sat, 12 Mar 2011 00:39:37 +0000 (16:39 -0800)
commit8b687543dedd030370870c5929312e4d56d85343
tree3e941e40f323db860d9969cea5e43b2a0185a0be
parentfbf621e3e563d9ec67107a347931eb573607764d
parent43edd45c76afdb151984f72110c8d6fa753eac6f
resolved conflicts for merge of 43edd45c to master

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