From 1e0ed6b2320893efdecdf300a9adf1dce3700710 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Thu, 18 Oct 2012 16:06:52 -0700
Subject: [PATCH] Fix missing @hide on ViewGroup.resolveLayoutParams()

- as we dont need this to be public

Change-Id: Ib8de262eec26d4785b13875d59599369b06a067d
---
 api/current.txt                       | 1 -
 core/java/android/view/ViewGroup.java | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index aadf11fb8e60b..d7f4e11398b83 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25642,7 +25642,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);
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index f49a839304b97..488833af271f1 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -5358,6 +5358,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
         }
     }
 
+    /**
+     * @hide
+     */
     @Override
     public void resolveLayoutParams() {
         super.resolveLayoutParams();