summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-04-16 02:32:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 02:32:59 +0000
commit133911095ce0d9ef01766aa7b67a0a31b852e242 (patch)
tree38c4e6bbebb7c2df1ba1c43c4ede44b42ab3e42a
parent3d9c9093d1d76d4aeb5f99b1746b65788c72736e (diff)
parent2b300a99bbb133090b7ec39e64dd65ba2bb8f18d (diff)
downloadframeworks_base-133911095ce0d9ef01766aa7b67a0a31b852e242.zip
frameworks_base-133911095ce0d9ef01766aa7b67a0a31b852e242.tar.gz
frameworks_base-133911095ce0d9ef01766aa7b67a0a31b852e242.tar.bz2
am 2b300a99: am 782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '2b300a99bbb133090b7ec39e64dd65ba2bb8f18d': [RenderScript] typo fix in Allocation.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 28547cc..4fa2c81 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -276,7 +276,7 @@ public class Allocation extends BaseObj {
* @hide
* 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) {