summaryrefslogtreecommitdiffstats
path: root/v8
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-04-16 01:55:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 01:55:12 +0000
commit95e32296aa843eab5c264fb7ba0d0b79a96eddd8 (patch)
treee2a8b432c7514c13ecc1904c40cfa24ae0e4ae40 /v8
parent591c707ed160fefdb74b2097e4c62e82ae262fdb (diff)
parent512c1e24fb9afc1b71d8a2aefa27aad05255a587 (diff)
downloadandroid_frameworks_support-95e32296aa843eab5c264fb7ba0d0b79a96eddd8.tar.gz
android_frameworks_support-95e32296aa843eab5c264fb7ba0d0b79a96eddd8.tar.bz2
android_frameworks_support-95e32296aa843eab5c264fb7ba0d0b79a96eddd8.zip
am 512c1e24: am 18e39c2d: am 79f7d687: Merge "[RenderScript] typo fix in Allocation.java"
* commit '512c1e24fb9afc1b71d8a2aefa27aad05255a587': [RenderScript] typo fix in Allocation.java
Diffstat (limited to 'v8')
-rw-r--r--v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java b/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java
index 1d0f8b0a13..03244ff74f 100644
--- a/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java
+++ b/v8/renderscript/java/src/android/support/v8/renderscript/Allocation.java
@@ -267,7 +267,7 @@ public class Allocation extends BaseObj {
/**
* Enable/Disable AutoPadding for Vec3 elements.
*
- * @param useAutoPadding True: enable AutoPadding; flase: disable AutoPadding
+ * @param useAutoPadding True: enable AutoPadding; False: disable AutoPadding
*
*/
public void setAutoPadding(boolean useAutoPadding) {