summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDiego Perez <diegoperez@google.com>2015-05-07 03:14:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-07 03:14:30 +0000
commit70280a20f379e416d9cff20b7c6764844e7c2ff4 (patch)
tree5eca516121f2e4ccf5d9eeabb3efb67eecc3b1b6 /tools
parent1290748db311fb8cf9e5491e988c82b0757ec57e (diff)
parent0fe14486211e3ade7f29ea76e16211853fe9cd7a (diff)
downloadframeworks_base-70280a20f379e416d9cff20b7c6764844e7c2ff4.zip
frameworks_base-70280a20f379e416d9cff20b7c6764844e7c2ff4.tar.gz
frameworks_base-70280a20f379e416d9cff20b7c6764844e7c2ff4.tar.bz2
am 0fe14486: am 2021c877: am 33e54563: am 4b125836: Merge "Added function to render a drawable in all available states" into lmp-mr1-dev
* commit '0fe14486211e3ade7f29ea76e16211853fe9cd7a': Added function to render a drawable in all available states
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java
index 3dee1e2..26f9000 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java
@@ -42,6 +42,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
* Action to render a given Drawable provided through {@link DrawableParams#getDrawable()}.
*