Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev

Author: Adam Cohen

api/current.txt

@@ -29005,7 +29005,6 @@ package android.widget {
     method public int describeContents();
     method public int getLayoutId();
     method public java.lang.String getPackage();
-    method public void mergeRemoteViews(android.widget.RemoteViews);
     method public boolean onLoadClass(java.lang.Class);
     method public void reapply(android.content.Context, android.view.View);
     method public void removeAllViews(int);

core/java/android/widget/RemoteViews.java

@@ -222,6 +222,14 @@ public String getUniqueKey() {
         int viewId;
     }
 
+    /**
+     * Merges the passed RemoteViews actions with this RemoteViews actions according to
+     * action-specific merge rules.
+     * 
+     * @param newRv
+     * 
+     * @hide
+     */
     public void mergeRemoteViews(RemoteViews newRv) {
         // We first copy the new RemoteViews, as the process of merging modifies the way the actions
         // reference the bitmap cache. We don't want to modify the object as it may need to