am 45c77ca: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev

* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
  Fix missing @hide on ViewGroup.resolveLayoutParams()

Author: Fabrice Di Meglio

api/current.txt

@@ -25661,7 +25661,6 @@ package android.view {
     method public void requestDisallowInterceptTouchEvent(boolean);
     method public boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
     method public void requestTransparentRegion(android.view.View);
-    method public void resolveLayoutParams();
     method public void scheduleLayoutAnimation();
     method public void setAddStatesFromChildren(boolean);
     method public void setAlwaysDrawnWithCacheEnabled(boolean);

core/java/android/view/ViewGroup.java

@@ -5358,6 +5358,9 @@ protected void resolveDrawables() {
         }
     }
 
+    /**
+     * @hide
+     */
     @Override
     public void resolveLayoutParams() {
         super.resolveLayoutParams();