summaryrefslogtreecommitdiffstats
path: root/rs/java/android/renderscript/ScriptIntrinsicBlur.java
diff options
context:
space:
mode:
authorAaron Whyte <awhyte@google.com>2014-05-13 20:36:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-13 20:36:31 +0000
commit8452776b950b26f86324636242dd302a596fae1d (patch)
tree3fb10f26c151c767ff771e534adfff91a9565a2d /rs/java/android/renderscript/ScriptIntrinsicBlur.java
parentcf768044cdbef02ba9c0d44f33c9f17735f91455 (diff)
parent5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b (diff)
downloadframeworks_base-8452776b950b26f86324636242dd302a596fae1d.zip
frameworks_base-8452776b950b26f86324636242dd302a596fae1d.tar.gz
frameworks_base-8452776b950b26f86324636242dd302a596fae1d.tar.bz2
am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
* commit '5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b': Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsicBlur.java')
0 files changed, 0 insertions, 0 deletions