summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2014-04-10 22:24:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-10 22:24:55 +0000
commit6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56 (patch)
treefeea981884f07367756ffe27e1b1751a94b240e5
parent822bbb382fa6b6c8d1b45770e27c2c2732a7afb7 (diff)
parent3931949bc49ab39e3f003f6683b0505bac747ee1 (diff)
downloadframeworks_base-6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56.zip
frameworks_base-6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56.tar.gz
frameworks_base-6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56.tar.bz2
Merge "Fix build breakage"
-rw-r--r--api/current.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 8564a89..7de59d5 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11031,8 +11031,6 @@ package android.graphics.drawable {
method public void setAnimationFraction(float);
method public void setColorFilter(android.graphics.ColorFilter);
method public void setDuration(long);
- method public void setIntrinsicHeight(int);
- method public void setIntrinsicWidth(int);
method public void setPadding(android.graphics.Rect);
method public void setPadding(int, int, int, int);
method public void setRepeatCount(int);