commit 0437302f164f3eb1ba6a359ef5b3cd857facbbe4
author Fabrice Di Meglio <fdimeglio@google.com> Thu Oct 18 15:37:26 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 18 15:37:26 2012 -0700
tree fa0178eb370eb68bcb988807bb1a8111e91f5358
parent d8149b03a8676a49f6ca500eecafe79fadf046a7
parent 3cb8d26bb0f024e8535e9e1266a5394e4f8c4628

Merge "Fix the build" into jb-mr1-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index d7f4e11..aadf11f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25642,6 +25642,7 @@
     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);