summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-10-18 15:43:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-18 15:43:02 -0700
commit2a902caab23819591570deacc1741677f7b21118 (patch)
tree5f012135873933ae6e183391b8718250550a85e6 /api
parentdc8ae9f758e034d63104a48daf4d8014fe5dc13a (diff)
parent193229a52a732f537e1f062426d1cc8d774bd2c7 (diff)
downloadframeworks_base-2a902caab23819591570deacc1741677f7b21118.zip
frameworks_base-2a902caab23819591570deacc1741677f7b21118.tar.gz
frameworks_base-2a902caab23819591570deacc1741677f7b21118.tar.bz2
am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-dev
* commit '193229a52a732f537e1f062426d1cc8d774bd2c7': Fix the build
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
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 @@ 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);