am 15b9de8c: am 1d5b3a63: Fix the build

Merge commit '15b9de8cf217c315acb57044c43a9b12da57b6c4' into eclair-mr2-plus-aosp

* commit '15b9de8cf217c315acb57044c43a9b12da57b6c4':
  Fix the build

api/current.xml

@@ -159210,6 +159210,19 @@
 <parameter name="canvas" type="android.graphics.Canvas">
 </parameter>
 </method>
+<method name="onDrawScrollBars"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+<parameter name="canvas" type="android.graphics.Canvas">
+</parameter>
+</method>
 <method name="onFinishInflate"
  return="void"
  abstract="false"

core/java/android/view/View.java

@@ -5549,7 +5549,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
      * 
      * @see #awakenScrollBars(int)
      */
-    private void onDrawScrollBars(Canvas canvas) {
+    protected final void onDrawScrollBars(Canvas canvas) {
         // scrollbars are drawn only when the animation is running
         final ScrollabilityCache cache = mScrollCache;
         if (cache != null) {