summaryrefslogtreecommitdiffstats
path: root/rs/java
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-04-16 02:46:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 02:46:43 +0000
commit68e03ab998d97c224a59ee5c1edb312bb14c3948 (patch)
tree81afab9440e7c08f00561dc6fad43a743511449f /rs/java
parentcb43ebb3604d45da8677b8d19c935f0ace08ea53 (diff)
parent133911095ce0d9ef01766aa7b67a0a31b852e242 (diff)
downloadframeworks_base-68e03ab998d97c224a59ee5c1edb312bb14c3948.zip
frameworks_base-68e03ab998d97c224a59ee5c1edb312bb14c3948.tar.gz
frameworks_base-68e03ab998d97c224a59ee5c1edb312bb14c3948.tar.bz2
am 13391109: am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '133911095ce0d9ef01766aa7b67a0a31b852e242': [RenderScript] typo fix in Allocation.java
Diffstat (limited to 'rs/java')
-rw-r--r--rs/java/android/renderscript/Allocation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 2203850..3b61f9d 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -276,7 +276,7 @@ public class Allocation extends BaseObj {
* Enable/Disable AutoPadding for Vec3 elements.
* By default: Diabled.
*
- * @param useAutoPadding True: enable AutoPadding; flase: disable AutoPadding
+ * @param useAutoPadding True: enable AutoPadding; False: disable AutoPadding
*
*/
public void setAutoPadding(boolean useAutoPadding) {