Merge changes Iaa88ac02,Ic6f8d1da,Idd07db5d

* changes:
  [RenderScript] Update documentation for Allocation.setAutoPadding().
  [RenderScript] Fix IntrinsicConvolve documentation.
  [RenderScript] Update the documentation of Script.LaunchOptions

1 files changed, 7 insertions, 2 deletions

diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 57c45a763e41..b9c5738a0936 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -296,8 +296,13 @@ public class Allocation extends BaseObj {
     }
 
     /**
-     * Enable/Disable AutoPadding for Vec3 elements.
-     * By default: Diabled.
+     * Enable/Disable AutoPadding for Vec3 Elements.
+     *
+     * <p> Vec3 Elements, such as {@link Element#U8_3} are treated as Vec4 Elements
+     * with the fourth vector element used as padding. Enabling the AutoPadding feature
+     * will automatically add/remove the padding when you copy to/from an Allocation
+     * with a Vec3 Element.
+     * <p> By default: Disabled.
      *
      * @param useAutoPadding True: enable AutoPadding; False: disable AutoPadding
      *