resolved conflicts for merge of 7165b1cd to master

Change-Id: I86e0f1726df824f3b53e878f3ae7ca3a98308539

diff --cc WebKit/android/RenderSkinMediaButton.cpp
index 3216b8d,c1451cb..8d426a3
--- 1/WebKit/android/RenderSkinMediaButton.cpp
--- 2/WebKit/android/RenderSkinMediaButton.cpp
+++ b/WebKit/android/RenderSkinMediaButton.cpp
@@@ -100,8 -100,14 +100,15 @@@ void RenderSkinMediaButton::Draw(SkCanv
      SkRect bounds(r);
      SkScalar imageMargin = 8;
      SkPaint paint;
-     SkColor backgroundColor = SkColorSetARGB(255, 200, 200, 200);
+ 
+     int alpha = 255;
+     if (translucent)
+         alpha = 190;
+ 
+     SkColor backgroundColor = SkColorSetARGB(alpha, 34, 34, 34);
 +    SkColor trackBackgroundColor = SkColorSetARGB(255, 100, 100, 100);
+     paint.setColor(backgroundColor);
+     paint.setFlags(SkPaint::kFilterBitmap_Flag);
  
      switch (buttonType) {
      case PAUSE: