diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-18 16:20:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-18 16:20:36 -0700 |
| commit | 45c77ca0f6afd568ff6d149e17fb43c684e51722 (patch) | |
| tree | 06035dcc07cd4fb6c24664afc9042c4a16665f81 /core | |
| parent | 0437302f164f3eb1ba6a359ef5b3cd857facbbe4 (diff) | |
| parent | 1e0ed6b2320893efdecdf300a9adf1dce3700710 (diff) | |
| download | frameworks_base-45c77ca0f6afd568ff6d149e17fb43c684e51722.zip frameworks_base-45c77ca0f6afd568ff6d149e17fb43c684e51722.tar.gz frameworks_base-45c77ca0f6afd568ff6d149e17fb43c684e51722.tar.bz2 | |
Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index f49a839..488833a 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(); |