diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-18 16:29:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-18 16:29:00 -0700 |
| commit | c38684af87787b6625dc72a0dc0ce5b8d4abb3b9 (patch) | |
| tree | 5880ed16afb286837666d3c812f082a07cd1ac7d /core | |
| parent | 5f9b095d4c27081b11c3e79d3912b06cb26208c8 (diff) | |
| parent | 4c2db5f2a579132f6b6861c50d7ff99bb6c8035c (diff) | |
| download | frameworks_base-c38684af87787b6625dc72a0dc0ce5b8d4abb3b9.zip frameworks_base-c38684af87787b6625dc72a0dc0ce5b8d4abb3b9.tar.gz frameworks_base-c38684af87787b6625dc72a0dc0ce5b8d4abb3b9.tar.bz2 | |
am 4c2db5f2: am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
* commit '4c2db5f2a579132f6b6861c50d7ff99bb6c8035c':
Fix missing @hide on ViewGroup.resolveLayoutParams()
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 92e8ea2..ca1c7fe 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -5449,6 +5449,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } } + /** + * @hide + */ @Override public void resolveLayoutParams() { super.resolveLayoutParams(); |