Merge "Doc change: Edits for final SDK and dev preview 3. Add selector to manage landing page image." into mnc-dev

commit: 42c22d04d9be578c4f32adfd43c1b37816a5c150 [log] [tgz]
author: Dirk Dougherty <ddougherty@google.com> Sun Aug 16 22:26:03 2015 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Sun Aug 16 22:26:03 2015 +0000
tree: 0ed686ac9ffbfc9db0667815fc8d93290929498d
parent: bf8f17f8dcfa0b923d7a8e16d85b09d61fdc39b9 [diff]
parent: 49eeebb0a754670fcec38fdd54b33b348f861fd5 [diff]
diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd
index 4caa3ad..8956076 100644
--- a/docs/html/about/versions/android-5.0.jd
+++ b/docs/html/about/versions/android-5.0.jd

@@ -103,7 +103,6 @@
 <h2>API Differences</h2>
 <ol>
 <li><a href="{@docRoot}sdk/api_diff/21/changes.html">API level 20 to 21 &raquo;</a> </li>
-<li><a href="{@docRoot}sdk/api_diff/preview-21/changes.html">L Developer Preview to 21 &raquo;</a> </li>
 </ol>
 
 <h2>See Also</h2>

diff --git a/docs/html/guide/topics/renderscript/reference/index.jd b/docs/html/guide/topics/renderscript/reference/index.jd
index 9221bfc..16745b2 100644
--- a/docs/html/guide/topics/renderscript/reference/index.jd
+++ b/docs/html/guide/topics/renderscript/reference/index.jd

@@ -186,6 +186,38 @@
   </tr>
   <tr class='alt-color api apilevel-1'>
     <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half'>half</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      16 bit floating point value
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half2'>half2</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Two 16 bit floats
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half3'>half3</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Three 16 bit floats
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half4'>half4</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Four 16 bit floats
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
       <a href='rs_value_types.html#android_rs:int16_t'>int16_t</a>
     </td>
     <td class='jd-descrcol' width='100%'>
@@ -322,6 +354,14 @@
   </tr>
   <tr class='alt-color api apilevel-1'>
     <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Handle to a kernel invocation context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
       <a href='rs_value_types.html#android_rs:rs_matrix2x2'>rs_matrix2x2</a>
     </td>
     <td class='jd-descrcol' width='100%'>
@@ -1805,6 +1845,110 @@
   </tr>
   <tr class='alt-color api apilevel-1'>
     <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray0'>rsGetArray0</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array0 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray1'>rsGetArray1</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array1 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray2'>rsGetArray2</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array2 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray3'>rsGetArray3</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array3 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray0'>rsGetDimArray0</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array0 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray1'>rsGetDimArray1</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array1 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray2'>rsGetDimArray2</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array2 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray3'>rsGetDimArray3</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array3 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimHasFaces'>rsGetDimHasFaces</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Presence of more than one face for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimLod'>rsGetDimLod</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Number of levels of detail for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the X dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimY'>rsGetDimY</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Y dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimZ'>rsGetDimZ</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Z dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
       <a href='rs_time.html#android_rs:rsGetDt'>rsGetDt</a>
     </td>
     <td class='jd-descrcol' width='100%'>
@@ -1845,6 +1989,22 @@
   </tr>
   <tr class='alt-color api apilevel-1'>
     <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetFace'>rsGetFace</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Coordinate of the Face for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetLod'>rsGetLod</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Levels of Detail dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
       <a href='rs_object_info.html#android_rs:rsIsObject'>rsIsObject</a>
     </td>
     <td class='jd-descrcol' width='100%'>

diff --git a/docs/html/guide/topics/renderscript/reference/overview.jd b/docs/html/guide/topics/renderscript/reference/overview.jd
index f85b843..1aa791b 100644
--- a/docs/html/guide/topics/renderscript/reference/overview.jd
+++ b/docs/html/guide/topics/renderscript/reference/overview.jd

@@ -30,7 +30,7 @@
 <tr><td>                 </td>  <td>8 bits        </td>   <td>16 bits         </td>   <td>32 bits       </td>   <td>64 bits</td></tr>
 <tr><td>Integer:         </td>  <td>char, <a href='rs_value_types.html#android_rs:int8_t'>int8_t</a>  </td>   <td>short, <a href='rs_value_types.html#android_rs:int16_t'>int16_t</a>  </td>   <td><a href='rs_value_types.html#android_rs:int32_t'>int32_t</a>       </td>   <td>long, long long, <a href='rs_value_types.html#android_rs:int64_t'>int64_t</a></td></tr>
 <tr><td>Unsigned integer:</td>  <td>uchar, <a href='rs_value_types.html#android_rs:uint8_t'>uint8_t</a></td>   <td>ushort, <a href='rs_value_types.html#android_rs:uint16_t'>uint16_t</a></td>   <td>uint, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a></td>   <td>ulong, <a href='rs_value_types.html#android_rs:uint64_t'>uint64_t</a></td></tr>
-<tr><td>Floating point:  </td>  <td>              </td>   <td>                </td>   <td>float         </td>   <td>double</td></tr>
+<tr><td>Floating point:  </td>  <td>              </td>   <td>half            </td>   <td>float         </td>   <td>double</td></tr>
 </table>
 </p>
 
@@ -180,6 +180,38 @@
   </tr>
   <tr class='alt-color api apilevel-1'>
     <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half'>half</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      16 bit floating point value
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half2'>half2</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Two 16 bit floats
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half3'>half3</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Three 16 bit floats
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half4'>half4</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Four 16 bit floats
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
       <a href='rs_value_types.html#android_rs:int16_t'>int16_t</a>
     </td>
     <td class='jd-descrcol' width='100%'>
@@ -2585,6 +2617,11 @@
 <h2>Kernel Invocation Functions and Types</h2>
 <p> The <a href='rs_for_each.html#android_rs:rsForEach'>rsForEach</a>() function can be used to invoke the root kernel of a script.
 </p>
+
+<p> The other functions are used to get the characteristics of the invocation of
+an executing kernel, like dimensions and current indices.  These functions take
+a <a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> as argument.
+</p>
 <table class='jd-sumtable'><tbody>
   <tr><th colspan='2'>Types</th></tr>
   <tr class='alt-color api apilevel-1'>
@@ -2597,6 +2634,14 @@
   </tr>
   <tr class='alt-color api apilevel-1'>
     <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Handle to a kernel invocation context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
       <a href='rs_for_each.html#android_rs:rs_script_call_t'>rs_script_call_t</a>
     </td>
     <td class='jd-descrcol' width='100%'>
@@ -2614,6 +2659,126 @@
       Invoke the root kernel of a script
     </td>
   </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray0'>rsGetArray0</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array0 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray1'>rsGetArray1</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array1 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray2'>rsGetArray2</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array2 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray3'>rsGetArray3</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array3 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray0'>rsGetDimArray0</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array0 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray1'>rsGetDimArray1</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array1 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray2'>rsGetDimArray2</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array2 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray3'>rsGetDimArray3</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array3 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimHasFaces'>rsGetDimHasFaces</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Presence of more than one face for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimLod'>rsGetDimLod</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Number of levels of detail for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the X dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimY'>rsGetDimY</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Y dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimZ'>rsGetDimZ</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Z dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetFace'>rsGetFace</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Coordinate of the Face for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetLod'>rsGetLod</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Levels of Detail dimension for the specified kernel context
+    </td>
+  </tr>
 </tbody></table>
 <h2>Input/Output Functions</h2>
 <p> These functions are used to:<ul>
@@ -2671,6 +2836,6 @@
   </tr>
 </tbody></table>
 <h2>Graphics Functions and Types</h2>
-<p> The graphics subsystem of RenderScript has been deprecated.
+<p> The graphics subsystem of RenderScript was removed at API level 23.
 </p>
 </div>

diff --git a/docs/html/guide/topics/renderscript/reference/rs_allocation_data.jd b/docs/html/guide/topics/renderscript/reference/rs_allocation_data.jd
index 3735cce..6353d78 100644
--- a/docs/html/guide/topics/renderscript/reference/rs_allocation_data.jd
+++ b/docs/html/guide/topics/renderscript/reference/rs_allocation_data.jd

@@ -1365,7 +1365,7 @@
 </p>
 
 <p> For efficiency, this function does not validate the inputs.  Trying to wrap the
-X index, exceeding the size of the allocation, or using indexes incompatible
+X index, exceeding the size of the allocation, or using indices incompatible
 with the dimensionality of the allocation yiels undefined results.
 </p>
 
@@ -1578,6 +1578,78 @@
         <td>        </td>
       </tr>
       <tr>
+        <td><a href='rs_value_types.html#android_rs:half'>half</a> rsGetElementAt_half(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half'>half</a> rsGetElementAt_half(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half'>half</a> rsGetElementAt_half(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> z);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half2'>half2</a> rsGetElementAt_half2(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half2'>half2</a> rsGetElementAt_half2(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half2'>half2</a> rsGetElementAt_half2(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> z);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half3'>half3</a> rsGetElementAt_half3(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half3'>half3</a> rsGetElementAt_half3(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half3'>half3</a> rsGetElementAt_half3(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> z);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half4'>half4</a> rsGetElementAt_half4(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half4'>half4</a> rsGetElementAt_half4(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:half4'>half4</a> rsGetElementAt_half4(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> z);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
         <td>int rsGetElementAt_int(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
 </td>
         <td>        </td>
@@ -2397,6 +2469,78 @@
         </td>
       </tr>
       <tr>
+        <td>void rsSetElementAt_half(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half'>half</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half'>half</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half'>half</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> z);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half2(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half2'>half2</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half2(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half2'>half2</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half2(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half2'>half2</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> z);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half3(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half3'>half3</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half3(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half3'>half3</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half3(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half3'>half3</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> z);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half4(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half4'>half4</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half4(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half4'>half4</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsSetElementAt_half4(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, <a href='rs_value_types.html#android_rs:half4'>half4</a> val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> y, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> z);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
         <td>void rsSetElementAt_int(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> a, int val, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> x);
 </td>
         <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 18</a>

diff --git a/docs/html/guide/topics/renderscript/reference/rs_convert.jd b/docs/html/guide/topics/renderscript/reference/rs_convert.jd
index bf1f611..d4bf77fa 100644
--- a/docs/html/guide/topics/renderscript/reference/rs_convert.jd
+++ b/docs/html/guide/topics/renderscript/reference/rs_convert.jd

@@ -1765,9 +1765,14 @@
     </tbody></table>
   </div>
   <div class='jd-tagdata jd-tagdescr'>
-<p> Packs three or four floating point RGBA values into a uchar4.  The RGBA values should be
-between 0.0 and 1.0 inclusive.  Values outside of this range are clamped to this range.
-However numbers greater than INT_MAX or less than INT_MIN can result in undefined behavior.
+<p> Packs three or four floating point RGBA values into a uchar4.
+</p>
+
+<p> The input values are typically between 0.0f and 1.0f inclusive.  For input values outside
+of this range, the resulting outputs will be clamped to be between 0 and 255.  As this
+clamping may be done after the input is multiplied by 255.f and converted to an integer,
+input numbers greater than INT_MAX/255.f or less than INT_MIN/255.f result in
+undefined behavior.
 </p>
 
 <p> If the alpha component is not specified, it is assumed to be 1.0, i.e. the result will

diff --git a/docs/html/guide/topics/renderscript/reference/rs_debug.jd b/docs/html/guide/topics/renderscript/reference/rs_debug.jd
index d041309..fe29981 100644
--- a/docs/html/guide/topics/renderscript/reference/rs_debug.jd
+++ b/docs/html/guide/topics/renderscript/reference/rs_debug.jd

@@ -78,6 +78,24 @@
         <td>        </td>
       </tr>
       <tr>
+        <td>void rsDebug(const char* message, <a href='rs_value_types.html#android_rs:double2'>double2</a> a);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsDebug(const char* message, <a href='rs_value_types.html#android_rs:double3'>double3</a> a);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
+        <td>void rsDebug(const char* message, <a href='rs_value_types.html#android_rs:double4'>double4</a> a);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+      <tr>
         <td>void rsDebug(const char* message, float a);
 </td>
         <td>        </td>

diff --git a/docs/html/guide/topics/renderscript/reference/rs_for_each.jd b/docs/html/guide/topics/renderscript/reference/rs_for_each.jd
index cad5a21..abbbda7 100644
--- a/docs/html/guide/topics/renderscript/reference/rs_for_each.jd
+++ b/docs/html/guide/topics/renderscript/reference/rs_for_each.jd

@@ -6,6 +6,11 @@
 <h2>Overview</h2>
 <p> The <a href='rs_for_each.html#android_rs:rsForEach'>rsForEach</a>() function can be used to invoke the root kernel of a script.
 </p>
+
+<p> The other functions are used to get the characteristics of the invocation of
+an executing kernel, like dimensions and current indices.  These functions take
+a <a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> as argument.
+</p>
 <h2>Summary</h2>
 <table class='jd-sumtable'><tbody>
   <tr><th colspan='2'>Types</th></tr>
@@ -19,6 +24,14 @@
   </tr>
   <tr class='alt-color api apilevel-1'>
     <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Handle to a kernel invocation context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
       <a href='rs_for_each.html#android_rs:rs_script_call_t'>rs_script_call_t</a>
     </td>
     <td class='jd-descrcol' width='100%'>
@@ -36,6 +49,126 @@
       Invoke the root kernel of a script
     </td>
   </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray0'>rsGetArray0</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array0 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray1'>rsGetArray1</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array1 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray2'>rsGetArray2</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array2 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetArray3'>rsGetArray3</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Array3 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray0'>rsGetDimArray0</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array0 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray1'>rsGetDimArray1</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array1 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray2'>rsGetDimArray2</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array2 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimArray3'>rsGetDimArray3</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Array3 dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimHasFaces'>rsGetDimHasFaces</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Presence of more than one face for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimLod'>rsGetDimLod</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Number of levels of detail for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the X dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimY'>rsGetDimY</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Y dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetDimZ'>rsGetDimZ</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Size of the Z dimension for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetFace'>rsGetFace</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Coordinate of the Face for the specified kernel context
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_for_each.html#android_rs:rsGetLod'>rsGetLod</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Index in the Levels of Detail dimension for the specified kernel context
+    </td>
+  </tr>
 </tbody></table>
 <h2>Types</h2>
 <a name='android_rs:rs_for_each_strategy_t'></a>
@@ -65,6 +198,26 @@
   </div>
 </div>
 
+<a name='android_rs:rs_kernel_context'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rs_kernel_context</span>
+    <span class='normal'>: Handle to a kernel invocation context</span>
+  </h4>
+  <div class='jd-details-descr'>
+<p>A typedef of: const struct rs_kernel_context_t *&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+</p>
+<p> The kernel context contains common characteristics of the allocations being iterated
+over, like dimensions.  It also contains rarely used indices of the currently processed
+cell, like the Array0 index or the current level of detail.
+</p>
+
+<p> You can access the kernel context by adding a special parameter named "context" of type
+rs_kernel_context to your kernel function.  See <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() and <a href='rs_for_each.html#android_rs:rsGetArray0'>rsGetArray0</a>() for examples.
+</p>
+  </div>
+</div>
+
 <a name='android_rs:rs_script_call_t'></a>
 <div class='jd-details'>
   <h4 class='jd-details-title'>
@@ -120,13 +273,13 @@
       <tr>
         <td>void rsForEach(<a href='rs_object_types.html#android_rs:rs_script'>rs_script</a> script, <a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> input, <a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> output, const void* usrData);
 </td>
-        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsForEach(<a href='rs_object_types.html#android_rs:rs_script'>rs_script</a> script, <a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> input, <a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> output, const void* usrData, const <a href='rs_for_each.html#android_rs:rs_script_call_t'>rs_script_call_t</a>* sc);
 </td>
-        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 and higher</a>
         </td>
       </tr>
       <tr>
@@ -180,4 +333,437 @@
   </div>
 </div>
 
+<a name='android_rs:rsGetArray0'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetArray0</span>
+    <span class='normal'>: Index in the Array0 dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetArray0(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the index in the Array0 dimension of the cell being processed, as specified
+by the supplied kernel context.
+</p>
+
+<p> The kernel context contains common characteristics of the allocations being iterated
+over and rarely used indices, like the Array0 index.
+</p>
+
+<p> You can access the kernel context by adding a special parameter named "context" of
+type rs_kernel_context to your kernel function.  E.g.<br/>
+<code>short RS_KERNEL myKernel(short value, uint32_t x, rs_kernel_context context) {<br/>
+&nbsp;&nbsp;// The current index in the common x, y, z dimensions are accessed by<br/>
+&nbsp;&nbsp;// adding these variables as arguments.  For the more rarely used indices<br/>
+&nbsp;&nbsp;// to the other dimensions, extract them from the kernel context:<br/>
+&nbsp;&nbsp;uint32_t index_a0 = rsGetArray0(context);<br/>
+&nbsp;&nbsp;//...<br/>
+}<br/></code>
+</p>
+
+<p> This function returns 0 if the Array0 dimension is not present.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetArray1'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetArray1</span>
+    <span class='normal'>: Index in the Array1 dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetArray1(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the index in the Array1 dimension of the cell being processed, as specified
+by the supplied kernel context.  See <a href='rs_for_each.html#android_rs:rsGetArray0'>rsGetArray0</a>() for an explanation of the context.
+</p>
+
+<p> Returns 0 if the Array1 dimension is not present.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetArray2'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetArray2</span>
+    <span class='normal'>: Index in the Array2 dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetArray2(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the index in the Array2 dimension of the cell being processed,
+as specified by the supplied kernel context.  See <a href='rs_for_each.html#android_rs:rsGetArray0'>rsGetArray0</a>() for an explanation
+of the context.
+</p>
+
+<p> Returns 0 if the Array2 dimension is not present.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetArray3'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetArray3</span>
+    <span class='normal'>: Index in the Array3 dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetArray3(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the index in the Array3 dimension of the cell being processed, as specified
+by the supplied kernel context.  See <a href='rs_for_each.html#android_rs:rsGetArray0'>rsGetArray0</a>() for an explanation of the context.
+</p>
+
+<p> Returns 0 if the Array3 dimension is not present.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetDimArray0'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetDimArray0</span>
+    <span class='normal'>: Size of the Array0 dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetDimArray0(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the size of the Array0 dimension for the specified kernel context.
+See <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() for an explanation of the context.
+</p>
+
+<p> Returns 0 if the Array0 dimension is not present.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetDimArray1'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetDimArray1</span>
+    <span class='normal'>: Size of the Array1 dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetDimArray1(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the size of the Array1 dimension for the specified kernel context.
+See <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() for an explanation of the context.
+</p>
+
+<p> Returns 0 if the Array1 dimension is not present.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetDimArray2'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetDimArray2</span>
+    <span class='normal'>: Size of the Array2 dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetDimArray2(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the size of the Array2 dimension for the specified kernel context.
+See <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() for an explanation of the context.
+</p>
+
+<p> Returns 0 if the Array2 dimension is not present.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetDimArray3'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetDimArray3</span>
+    <span class='normal'>: Size of the Array3 dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetDimArray3(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the size of the Array3 dimension for the specified kernel context.
+See <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() for an explanation of the context.
+</p>
+
+<p> Returns 0 if the Array3 dimension is not present.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetDimHasFaces'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetDimHasFaces</span>
+    <span class='normal'>: Presence of more than one face for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td>bool rsGetDimHasFaces(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata'>    <h5 class='jd-tagtitle'>Returns</h5>
+    <table class='jd-tagtable'><tbody>
+    <tr><td>Returns true if more than one face is present, false otherwise.</td></tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> If the kernel is iterating over a cubemap, this function returns true if there's more
+than one face present.  In all other cases, it returns false.  See <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() for an
+explanation of the context.
+</p>
+
+<p> <a href='rs_object_info.html#android_rs:rsAllocationGetDimFaces'>rsAllocationGetDimFaces</a>() is similar but returns 0 or 1 instead of a bool.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetDimLod'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetDimLod</span>
+    <span class='normal'>: Number of levels of detail for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetDimLod(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the number of levels of detail for the specified kernel context.  This is useful
+for mipmaps.  See <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() for an explanation of the context.
+</p>
+
+<p> Returns 0 if Level of Detail is not used.
+</p>
+
+<p> <a href='rs_object_info.html#android_rs:rsAllocationGetDimLOD'>rsAllocationGetDimLOD</a>() is similar but returns 0 or 1 instead the actual
+number of levels.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetDimX'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetDimX</span>
+    <span class='normal'>: Size of the X dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetDimX(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the size of the X dimension for the specified kernel context.
+</p>
+
+<p> The kernel context contains common characteristics of the allocations being iterated
+over and rarely used indices, like the Array0 index.
+</p>
+
+<p> You can access it by adding a special parameter named "context" of
+type rs_kernel_context to your kernel function.  E.g.<br/>
+<code>int4 RS_KERNEL myKernel(int4 value, rs_kernel_context context) {<br/>
+&nbsp;&nbsp;uint32_t size = rsGetDimX(context); //...<br/></code>
+</p>
+
+<p> To get the dimension of specific allocation, use <a href='rs_object_info.html#android_rs:rsAllocationGetDimX'>rsAllocationGetDimX</a>().
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetDimY'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetDimY</span>
+    <span class='normal'>: Size of the Y dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetDimY(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the size of the X dimension for the specified kernel context.
+See <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() for an explanation of the context.
+</p>
+
+<p> Returns 0 if the Y dimension is not present.
+</p>
+
+<p> To get the dimension of specific allocation, use <a href='rs_object_info.html#android_rs:rsAllocationGetDimY'>rsAllocationGetDimY</a>().
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetDimZ'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetDimZ</span>
+    <span class='normal'>: Size of the Z dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetDimZ(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the size of the Z dimension for the specified kernel context.
+See <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() for an explanation of the context.
+</p>
+
+<p> Returns 0 if the Z dimension is not present.
+</p>
+
+<p> To get the dimension of specific allocation, use <a href='rs_object_info.html#android_rs:rsAllocationGetDimZ'>rsAllocationGetDimZ</a>().
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetFace'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetFace</span>
+    <span class='normal'>: Coordinate of the Face for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_object_types.html#android_rs:rs_allocation_cubemap_face'>rs_allocation_cubemap_face</a> rsGetFace(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the face on which the cell being processed is found, as specified by the
+supplied kernel context.  See <a href='rs_for_each.html#android_rs:rsGetArray0'>rsGetArray0</a>() for an explanation of the context.
+</p>
+
+<p> Returns RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X if the face dimension is not
+present.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:rsGetLod'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>rsGetLod</span>
+    <span class='normal'>: Index in the Levels of Detail dimension for the specified kernel context</span>
+  </h4>
+  <div class='jd-details-descr'>
+    <table class='jd-tagtable'><tbody>
+      <tr>
+        <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsGetLod(<a href='rs_for_each.html#android_rs:rs_kernel_context'>rs_kernel_context</a> context);
+</td>
+        <td>    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+        </td>
+      </tr>
+    </tbody></table>
+  </div>
+  <div class='jd-tagdata jd-tagdescr'>
+<p> Returns the index in the Levels of Detail dimension of the cell being processed,
+as specified by the supplied kernel context.  See <a href='rs_for_each.html#android_rs:rsGetArray0'>rsGetArray0</a>() for an explanation of
+the context.
+</p>
+
+<p> Returns 0 if the Levels of Detail dimension is not present.
+</p>
+  </div>
+</div>
+
 </div>

diff --git a/docs/html/guide/topics/renderscript/reference/rs_graphics.jd b/docs/html/guide/topics/renderscript/reference/rs_graphics.jd
index ee50184..1b115fe 100644
--- a/docs/html/guide/topics/renderscript/reference/rs_graphics.jd
+++ b/docs/html/guide/topics/renderscript/reference/rs_graphics.jd

@@ -4,7 +4,7 @@
 
 <div class='renderscript'>
 <h2>Overview</h2>
-<p> The graphics subsystem of RenderScript has been deprecated.
+<p> The graphics subsystem of RenderScript was removed at API level 23.
 </p>
 <h2>Summary</h2>
 <table class='jd-sumtable'><tbody>
@@ -502,7 +502,7 @@
   </h4>
   <div class='jd-details-descr'>
 <p>An enum with the following values:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
 </p>
   <table class='jd-tagtable'><tbody>
     <tr><th>RS_BLEND_DST_ZERO = 0</th><td></td></tr>
@@ -527,7 +527,7 @@
   </h4>
   <div class='jd-details-descr'>
 <p>An enum with the following values:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
 </p>
   <table class='jd-tagtable'><tbody>
     <tr><th>RS_BLEND_SRC_ZERO = 0</th><td></td></tr>
@@ -553,7 +553,7 @@
   </h4>
   <div class='jd-details-descr'>
 <p>An enum with the following values:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
 </p>
   <table class='jd-tagtable'><tbody>
     <tr><th>RS_CULL_BACK = 0</th><td></td></tr>
@@ -573,7 +573,7 @@
   </h4>
   <div class='jd-details-descr'>
 <p>An enum with the following values:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
 </p>
   <table class='jd-tagtable'><tbody>
     <tr><th>RS_DEPTH_FUNC_ALWAYS = 0</th><td>Always drawn</td></tr>
@@ -599,7 +599,11 @@
     <span class='normal'>: Handle to a Font</span>
   </h4>
   <div class='jd-details-descr'>
-<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. 
+<p>A typedef of: _RS_HANDLE __attribute__((
+#if (defined(RS_VERSION) && (RS_VERSION >= 1))
+deprecated
+#endif
+))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
 </p>
     <p><b>Deprecated.</b>  Do not use.</p>
 <p> Opaque handle to a RenderScript font object.
@@ -615,7 +619,11 @@
     <span class='normal'>: Handle to a Mesh</span>
   </h4>
   <div class='jd-details-descr'>
-<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. 
+<p>A typedef of: _RS_HANDLE __attribute__((
+#if (defined(RS_VERSION) && (RS_VERSION >= 1))
+deprecated
+#endif
+))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
 </p>
     <p><b>Deprecated.</b>  Do not use.</p>
 <p> Opaque handle to a RenderScript mesh object.
@@ -632,7 +640,7 @@
   </h4>
   <div class='jd-details-descr'>
 <p>An enum with the following values:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
 </p>
   <table class='jd-tagtable'><tbody>
     <tr><th>RS_PRIMITIVE_POINT = 0</th><td>Vertex data will be rendered as a series of points</td></tr>
@@ -656,7 +664,11 @@
     <span class='normal'>: Handle to a ProgramFragment</span>
   </h4>
   <div class='jd-details-descr'>
-<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. 
+<p>A typedef of: _RS_HANDLE __attribute__((
+#if (defined(RS_VERSION) && (RS_VERSION >= 1))
+deprecated
+#endif
+))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
 </p>
     <p><b>Deprecated.</b>  Do not use.</p>
 <p> Opaque handle to a RenderScript ProgramFragment object.
@@ -672,7 +684,11 @@
     <span class='normal'>: Handle to a ProgramRaster</span>
   </h4>
   <div class='jd-details-descr'>
-<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. 
+<p>A typedef of: _RS_HANDLE __attribute__((
+#if (defined(RS_VERSION) && (RS_VERSION >= 1))
+deprecated
+#endif
+))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
 </p>
     <p><b>Deprecated.</b>  Do not use.</p>
 <p> Opaque handle to a RenderScript ProgramRaster object.
@@ -688,7 +704,11 @@
     <span class='normal'>: Handle to a ProgramStore</span>
   </h4>
   <div class='jd-details-descr'>
-<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. 
+<p>A typedef of: _RS_HANDLE __attribute__((
+#if (defined(RS_VERSION) && (RS_VERSION >= 1))
+deprecated
+#endif
+))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
 </p>
     <p><b>Deprecated.</b>  Do not use.</p>
 <p> Opaque handle to a RenderScript ProgramStore object.
@@ -704,7 +724,11 @@
     <span class='normal'>: Handle to a ProgramVertex</span>
   </h4>
   <div class='jd-details-descr'>
-<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. 
+<p>A typedef of: _RS_HANDLE __attribute__((
+#if (defined(RS_VERSION) && (RS_VERSION >= 1))
+deprecated
+#endif
+))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
 </p>
     <p><b>Deprecated.</b>  Do not use.</p>
 <p> Opaque handle to a RenderScript ProgramVertex object.
@@ -725,13 +749,13 @@
       <tr>
         <td>void rsgAllocationSyncAll(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> alloc);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsgAllocationSyncAll(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> alloc, <a href='rs_object_types.html#android_rs:rs_allocation_usage_type'>rs_allocation_usage_type</a> source);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -761,7 +785,7 @@
       <tr>
         <td>void rsgBindColorTarget(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> colorTarget, <a href='rs_value_types.html#android_rs:uint'>uint</a> slot);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -784,13 +808,13 @@
       <tr>
         <td>void rsgBindConstant(<a href='rs_graphics.html#android_rs:rs_program_fragment'>rs_program_fragment</a> ps, <a href='rs_value_types.html#android_rs:uint'>uint</a> slot, <a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> c);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsgBindConstant(<a href='rs_graphics.html#android_rs:rs_program_vertex'>rs_program_vertex</a> pv, <a href='rs_value_types.html#android_rs:uint'>uint</a> slot, <a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> c);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -822,7 +846,7 @@
       <tr>
         <td>void rsgBindDepthTarget(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> depthTarget);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -845,7 +869,7 @@
       <tr>
         <td>void rsgBindFont(<a href='rs_graphics.html#android_rs:rs_font'>rs_font</a> font);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -873,7 +897,7 @@
       <tr>
         <td>void rsgBindProgramFragment(<a href='rs_graphics.html#android_rs:rs_program_fragment'>rs_program_fragment</a> pf);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -896,7 +920,7 @@
       <tr>
         <td>void rsgBindProgramRaster(<a href='rs_graphics.html#android_rs:rs_program_raster'>rs_program_raster</a> pr);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -919,7 +943,7 @@
       <tr>
         <td>void rsgBindProgramStore(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -942,7 +966,7 @@
       <tr>
         <td>void rsgBindProgramVertex(<a href='rs_graphics.html#android_rs:rs_program_vertex'>rs_program_vertex</a> pv);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -965,7 +989,7 @@
       <tr>
         <td>void rsgBindSampler(<a href='rs_graphics.html#android_rs:rs_program_fragment'>rs_program_fragment</a> fragment, <a href='rs_value_types.html#android_rs:uint'>uint</a> slot, <a href='rs_object_types.html#android_rs:rs_sampler'>rs_sampler</a> sampler);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -989,7 +1013,7 @@
       <tr>
         <td>void rsgBindTexture(<a href='rs_graphics.html#android_rs:rs_program_fragment'>rs_program_fragment</a> v, <a href='rs_value_types.html#android_rs:uint'>uint</a> slot, <a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> alloc);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1015,7 +1039,7 @@
       <tr>
         <td>void rsgClearAllRenderTargets();
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1039,7 +1063,7 @@
       <tr>
         <td>void rsgClearColor(float r, float g, float b, float a);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1062,7 +1086,7 @@
       <tr>
         <td>void rsgClearColorTarget(<a href='rs_value_types.html#android_rs:uint'>uint</a> slot);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1085,7 +1109,7 @@
       <tr>
         <td>void rsgClearDepth(float value);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1108,7 +1132,7 @@
       <tr>
         <td>void rsgClearDepthTarget();
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1131,19 +1155,19 @@
       <tr>
         <td>void rsgDrawMesh(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> ism);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsgDrawMesh(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> ism, <a href='rs_value_types.html#android_rs:uint'>uint</a> primitiveIndex);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsgDrawMesh(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> ism, <a href='rs_value_types.html#android_rs:uint'>uint</a> primitiveIndex, <a href='rs_value_types.html#android_rs:uint'>uint</a> start, <a href='rs_value_types.html#android_rs:uint'>uint</a> len);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1183,7 +1207,7 @@
       <tr>
         <td>void rsgDrawQuad(float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, float x4, float y4, float z4);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1207,7 +1231,7 @@
       <tr>
         <td>void rsgDrawQuadTexCoords(float x1, float y1, float z1, float u1, float v1, float x2, float y2, float z2, float u2, float v2, float x3, float y3, float z3, float u3, float v3, float x4, float y4, float z4, float u4, float v4);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1231,7 +1255,7 @@
       <tr>
         <td>void rsgDrawRect(float x1, float y1, float x2, float y2, float z);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1255,7 +1279,7 @@
       <tr>
         <td>void rsgDrawSpriteScreenspace(float x, float y, float z, float w, float h);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1281,13 +1305,13 @@
       <tr>
         <td>void rsgDrawText(const char* text, int x, int y);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsgDrawText(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> alloc, int x, int y);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1310,7 +1334,7 @@
       <tr>
         <td><a href='rs_value_types.html#android_rs:uint'>uint</a> rsgFinish();
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1333,7 +1357,7 @@
       <tr>
         <td>void rsgFontColor(float r, float g, float b, float a);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1364,7 +1388,7 @@
       <tr>
         <td><a href='rs_value_types.html#android_rs:uint'>uint</a> rsgGetHeight();
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1387,7 +1411,7 @@
       <tr>
         <td><a href='rs_value_types.html#android_rs:uint'>uint</a> rsgGetWidth();
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1410,13 +1434,13 @@
       <tr>
         <td>void rsgMeasureText(const char* text, int* left, int* right, int* top, int* bottom);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsgMeasureText(<a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> alloc, int* left, int* right, int* top, int* bottom);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1440,13 +1464,13 @@
       <tr>
         <td>void rsgMeshComputeBoundingBox(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> mesh, float* minX, float* minY, float* min, float* maxX, float* maxY, float* maxZ);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsgMeshComputeBoundingBox(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> mesh, <a href='rs_value_types.html#android_rs:float3'>float3</a>* bBoxMin, <a href='rs_value_types.html#android_rs:float3'>float3</a>* bBoxMax);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1469,7 +1493,7 @@
       <tr>
         <td><a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> rsgMeshGetIndexAllocation(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> m, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> index);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1504,7 +1528,7 @@
       <tr>
         <td><a href='rs_graphics.html#android_rs:rs_primitive'>rs_primitive</a> rsgMeshGetPrimitive(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> m, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> index);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1539,7 +1563,7 @@
       <tr>
         <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsgMeshGetPrimitiveCount(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> m);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1573,7 +1597,7 @@
       <tr>
         <td><a href='rs_object_types.html#android_rs:rs_allocation'>rs_allocation</a> rsgMeshGetVertexAllocation(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> m, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> index);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1608,7 +1632,7 @@
       <tr>
         <td><a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a> rsgMeshGetVertexAllocationCount(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> m);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1642,7 +1666,7 @@
       <tr>
         <td>void rsgProgramFragmentConstantColor(<a href='rs_graphics.html#android_rs:rs_program_fragment'>rs_program_fragment</a> pf, float r, float g, float b, float a);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -1665,7 +1689,7 @@
       <tr>
         <td><a href='rs_graphics.html#android_rs:rs_cull_mode'>rs_cull_mode</a> rsgProgramRasterGetCullMode(<a href='rs_graphics.html#android_rs:rs_program_raster'>rs_program_raster</a> pr);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1693,7 +1717,7 @@
       <tr>
         <td>bool rsgProgramRasterIsPointSpriteEnabled(<a href='rs_graphics.html#android_rs:rs_program_raster'>rs_program_raster</a> pr);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1721,7 +1745,7 @@
       <tr>
         <td><a href='rs_graphics.html#android_rs:rs_blend_dst_func'>rs_blend_dst_func</a> rsgProgramStoreGetBlendDstFunc(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1749,7 +1773,7 @@
       <tr>
         <td><a href='rs_graphics.html#android_rs:rs_blend_src_func'>rs_blend_src_func</a> rsgProgramStoreGetBlendSrcFunc(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1777,7 +1801,7 @@
       <tr>
         <td><a href='rs_graphics.html#android_rs:rs_depth_func'>rs_depth_func</a> rsgProgramStoreGetDepthFunc(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1805,7 +1829,7 @@
       <tr>
         <td>bool rsgProgramStoreIsColorMaskAlphaEnabled(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1833,7 +1857,7 @@
       <tr>
         <td>bool rsgProgramStoreIsColorMaskBlueEnabled(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1861,7 +1885,7 @@
       <tr>
         <td>bool rsgProgramStoreIsColorMaskGreenEnabled(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1889,7 +1913,7 @@
       <tr>
         <td>bool rsgProgramStoreIsColorMaskRedEnabled(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1917,7 +1941,7 @@
       <tr>
         <td>bool rsgProgramStoreIsDepthMaskEnabled(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1945,7 +1969,7 @@
       <tr>
         <td>bool rsgProgramStoreIsDitherEnabled(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> ps);
 </td>
-        <td>    When compiling for 32 bits. Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16</a>
+        <td>    When compiling for 32 bits. <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 16 - 22</a>
         </td>
       </tr>
     </tbody></table>
@@ -1973,7 +1997,7 @@
       <tr>
         <td>void rsgProgramVertexGetProjectionMatrix(<a href='rs_value_types.html#android_rs:rs_matrix4x4'>rs_matrix4x4</a>* proj);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -2003,7 +2027,7 @@
       <tr>
         <td>void rsgProgramVertexLoadModelMatrix(const <a href='rs_value_types.html#android_rs:rs_matrix4x4'>rs_matrix4x4</a>* model);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -2033,7 +2057,7 @@
       <tr>
         <td>void rsgProgramVertexLoadProjectionMatrix(const <a href='rs_value_types.html#android_rs:rs_matrix4x4'>rs_matrix4x4</a>* proj);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>
@@ -2063,7 +2087,7 @@
       <tr>
         <td>void rsgProgramVertexLoadTextureMatrix(const <a href='rs_value_types.html#android_rs:rs_matrix4x4'>rs_matrix4x4</a>* tex);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
     </tbody></table>

diff --git a/docs/html/guide/topics/renderscript/reference/rs_matrix.jd b/docs/html/guide/topics/renderscript/reference/rs_matrix.jd
index 5d0df18..a92c225 100644
--- a/docs/html/guide/topics/renderscript/reference/rs_matrix.jd
+++ b/docs/html/guide/topics/renderscript/reference/rs_matrix.jd

@@ -752,7 +752,7 @@
       <tr>
         <td><a href='rs_value_types.html#android_rs:float2'>float2</a> rsMatrixMultiply(<a href='rs_value_types.html#android_rs:rs_matrix2x2'>rs_matrix2x2</a>* m, <a href='rs_value_types.html#android_rs:float2'>float2</a> in);
 </td>
-        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 and higher</a>
         </td>
       </tr>
       <tr>
@@ -770,13 +770,13 @@
       <tr>
         <td><a href='rs_value_types.html#android_rs:float3'>float3</a> rsMatrixMultiply(<a href='rs_value_types.html#android_rs:rs_matrix3x3'>rs_matrix3x3</a>* m, <a href='rs_value_types.html#android_rs:float2'>float2</a> in);
 </td>
-        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 and higher</a>
         </td>
       </tr>
       <tr>
         <td><a href='rs_value_types.html#android_rs:float3'>float3</a> rsMatrixMultiply(<a href='rs_value_types.html#android_rs:rs_matrix3x3'>rs_matrix3x3</a>* m, <a href='rs_value_types.html#android_rs:float3'>float3</a> in);
 </td>
-        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 and higher</a>
         </td>
       </tr>
       <tr>
@@ -800,19 +800,19 @@
       <tr>
         <td><a href='rs_value_types.html#android_rs:float4'>float4</a> rsMatrixMultiply(<a href='rs_value_types.html#android_rs:rs_matrix4x4'>rs_matrix4x4</a>* m, <a href='rs_value_types.html#android_rs:float2'>float2</a> in);
 </td>
-        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 and higher</a>
         </td>
       </tr>
       <tr>
         <td><a href='rs_value_types.html#android_rs:float4'>float4</a> rsMatrixMultiply(<a href='rs_value_types.html#android_rs:rs_matrix4x4'>rs_matrix4x4</a>* m, <a href='rs_value_types.html#android_rs:float3'>float3</a> in);
 </td>
-        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 and higher</a>
         </td>
       </tr>
       <tr>
         <td><a href='rs_value_types.html#android_rs:float4'>float4</a> rsMatrixMultiply(<a href='rs_value_types.html#android_rs:rs_matrix4x4'>rs_matrix4x4</a>* m, <a href='rs_value_types.html#android_rs:float4'>float4</a> in);
 </td>
-        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14</a>
+        <td>    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 14 and higher</a>
         </td>
       </tr>
       <tr>

diff --git a/docs/html/guide/topics/renderscript/reference/rs_object_info.jd b/docs/html/guide/topics/renderscript/reference/rs_object_info.jd
index 192df54..111d8fd 100644
--- a/docs/html/guide/topics/renderscript/reference/rs_object_info.jd
+++ b/docs/html/guide/topics/renderscript/reference/rs_object_info.jd

@@ -290,6 +290,9 @@
 <p> If the Allocation is a cubemap, this function returns 1 if there's more than one face
 present.  In all other cases, it returns 0.
 </p>
+
+<p> Use <a href='rs_for_each.html#android_rs:rsGetDimHasFaces'>rsGetDimHasFaces</a>() to get the dimension of a currently running kernel.
+</p>
   </div>
 </div>
 
@@ -317,6 +320,9 @@
 <p> Query an Allocation for the presence of more than one Level Of Detail.  This is useful
 for mipmaps.
 </p>
+
+<p> Use <a href='rs_for_each.html#android_rs:rsGetDimLod'>rsGetDimLod</a>() to get the dimension of a currently running kernel.
+</p>
   </div>
 </div>
 
@@ -343,6 +349,9 @@
   <div class='jd-tagdata jd-tagdescr'>
 <p> Returns the size of the X dimension of the Allocation.
 </p>
+
+<p> Use <a href='rs_for_each.html#android_rs:rsGetDimX'>rsGetDimX</a>() to get the dimension of a currently running kernel.
+</p>
   </div>
 </div>
 
@@ -370,6 +379,9 @@
 <p> Returns the size of the Y dimension of the Allocation.  If the Allocation has less
 than two dimensions, returns 0.
 </p>
+
+<p> Use <a href='rs_for_each.html#android_rs:rsGetDimY'>rsGetDimY</a>() to get the dimension of a currently running kernel.
+</p>
   </div>
 </div>
 
@@ -397,6 +409,9 @@
 <p> Returns the size of the Z dimension of the Allocation.  If the Allocation has less
 than three dimensions, returns 0.
 </p>
+
+<p> Use <a href='rs_for_each.html#android_rs:rsGetDimZ'>rsGetDimZ</a>() to get the dimension of a currently running kernel.
+</p>
   </div>
 </div>
 
@@ -453,37 +468,37 @@
       <tr>
         <td>void rsClearObject(<a href='rs_graphics.html#android_rs:rs_font'>rs_font</a>* dst);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsClearObject(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a>* dst);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsClearObject(<a href='rs_graphics.html#android_rs:rs_program_fragment'>rs_program_fragment</a>* dst);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsClearObject(<a href='rs_graphics.html#android_rs:rs_program_raster'>rs_program_raster</a>* dst);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsClearObject(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a>* dst);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>void rsClearObject(<a href='rs_graphics.html#android_rs:rs_program_vertex'>rs_program_vertex</a>* dst);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
@@ -885,37 +900,37 @@
       <tr>
         <td>bool rsIsObject(<a href='rs_graphics.html#android_rs:rs_font'>rs_font</a> v);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>bool rsIsObject(<a href='rs_graphics.html#android_rs:rs_mesh'>rs_mesh</a> v);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>bool rsIsObject(<a href='rs_graphics.html#android_rs:rs_program_fragment'>rs_program_fragment</a> v);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>bool rsIsObject(<a href='rs_graphics.html#android_rs:rs_program_raster'>rs_program_raster</a> v);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>bool rsIsObject(<a href='rs_graphics.html#android_rs:rs_program_store'>rs_program_store</a> v);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>
         <td>bool rsIsObject(<a href='rs_graphics.html#android_rs:rs_program_vertex'>rs_program_vertex</a> v);
 </td>
-        <td>    When compiling for 32 bits. 
+        <td>    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>
         </td>
       </tr>
       <tr>

diff --git a/docs/html/guide/topics/renderscript/reference/rs_value_types.jd b/docs/html/guide/topics/renderscript/reference/rs_value_types.jd
index a7caf10..85c7a5c 100644
--- a/docs/html/guide/topics/renderscript/reference/rs_value_types.jd
+++ b/docs/html/guide/topics/renderscript/reference/rs_value_types.jd

@@ -12,7 +12,7 @@
 <tr><td>                 </td>  <td>8 bits        </td>   <td>16 bits         </td>   <td>32 bits       </td>   <td>64 bits</td></tr>
 <tr><td>Integer:         </td>  <td>char, <a href='rs_value_types.html#android_rs:int8_t'>int8_t</a>  </td>   <td>short, <a href='rs_value_types.html#android_rs:int16_t'>int16_t</a>  </td>   <td><a href='rs_value_types.html#android_rs:int32_t'>int32_t</a>       </td>   <td>long, long long, <a href='rs_value_types.html#android_rs:int64_t'>int64_t</a></td></tr>
 <tr><td>Unsigned integer:</td>  <td>uchar, <a href='rs_value_types.html#android_rs:uint8_t'>uint8_t</a></td>   <td>ushort, <a href='rs_value_types.html#android_rs:uint16_t'>uint16_t</a></td>   <td>uint, <a href='rs_value_types.html#android_rs:uint32_t'>uint32_t</a></td>   <td>ulong, <a href='rs_value_types.html#android_rs:uint64_t'>uint64_t</a></td></tr>
-<tr><td>Floating point:  </td>  <td>              </td>   <td>                </td>   <td>float         </td>   <td>double</td></tr>
+<tr><td>Floating point:  </td>  <td>              </td>   <td>half            </td>   <td>float         </td>   <td>double</td></tr>
 </table>
 </p>
 
@@ -163,6 +163,38 @@
   </tr>
   <tr class='alt-color api apilevel-1'>
     <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half'>half</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      16 bit floating point value
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half2'>half2</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Two 16 bit floats
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half3'>half3</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Three 16 bit floats
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
+      <a href='rs_value_types.html#android_rs:half4'>half4</a>
+    </td>
+    <td class='jd-descrcol' width='100%'>
+      Four 16 bit floats
+    </td>
+  </tr>
+  <tr class='alt-color api apilevel-1'>
+    <td class='jd-linkcol'>
       <a href='rs_value_types.html#android_rs:int16_t'>int16_t</a>
     </td>
     <td class='jd-descrcol' width='100%'>
@@ -605,6 +637,65 @@
   </div>
 </div>
 
+<a name='android_rs:half'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>half</span>
+    <span class='normal'>: 16 bit floating point value</span>
+  </h4>
+  <div class='jd-details-descr'>
+<p>A typedef of: __fp16&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+</p>
+<p> A 16 bit floating point value.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:half2'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>half2</span>
+    <span class='normal'>: Two 16 bit floats</span>
+  </h4>
+  <div class='jd-details-descr'>
+<p>A typedef of: half __attribute__((ext_vector_type(2)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+</p>
+<p> Vector version of the half float type. Provides two half fields packed
+into a single 32 bit field with 32 bit alignment.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:half3'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>half3</span>
+    <span class='normal'>: Three 16 bit floats</span>
+  </h4>
+  <div class='jd-details-descr'>
+<p>A typedef of: half __attribute__((ext_vector_type(3)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+</p>
+<p> Vector version of the half float type. Provides three half fields packed
+into a single 64 bit field with 64 bit alignment.
+</p>
+  </div>
+</div>
+
+<a name='android_rs:half4'></a>
+<div class='jd-details'>
+  <h4 class='jd-details-title'>
+    <span class='sympad'>half4</span>
+    <span class='normal'>: Four 16 bit floats</span>
+  </h4>
+  <div class='jd-details-descr'>
+<p>A typedef of: half __attribute__((ext_vector_type(4)))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23</a>
+</p>
+<p> Vector version of the half float type. Provides four half fields packed
+into a single 64 bit field with 64 bit alignment.
+</p>
+  </div>
+</div>
+
 <a name='android_rs:int16_t'></a>
 <div class='jd-details'>
   <h4 class='jd-details-title'>
@@ -680,7 +771,7 @@
     <span class='normal'>: 64 bit signed integer</span>
   </h4>
   <div class='jd-details-descr'>
-<p>A typedef of: long long&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 21</a>
+<p>A typedef of: long long&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 21 and higher</a>
 </p>
 <p>A typedef of: long&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 21</a>
 </p>
@@ -1037,7 +1128,7 @@
     <span class='normal'>: 64 bit unsigned integer</span>
   </h4>
   <div class='jd-details-descr'>
-<p>A typedef of: unsigned long long&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 21</a>
+<p>A typedef of: unsigned long long&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 21 and higher</a>
 </p>
 <p>A typedef of: unsigned long&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    Added in <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 21</a>
 </p>

diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd
index 106dab3..de99d0d 100644
--- a/docs/html/preview/download.jd
+++ b/docs/html/preview/download.jd

@@ -197,10 +197,11 @@
 <h2 id="docs">Developer Documentation</h2>
 
 <p>
-	The developer documentation download package provides detailed API reference information and
-	an API difference report for the preview. Note that <a href="{@docRoot}reference/packages.html">API
-	level 23 reference</a> and <a href="{@docRoot}sdk/api_diff/23/changes.html">diffs</a> are now
-	also available online. 
+  The developer documentation for Developer Preview 3 is released as Android 6.0 (API level 23) and
+  is available online, including the <a href="{@docRoot}reference/packages.html">API level 23
+  reference</a> and <a href="{@docRoot}sdk/api_diff/23/changes.html">diff report</a>. The following
+  developer documentation download package provides additional, incremental difference reports
+  between the preview releases.
 </p>
 
 <table>
@@ -212,8 +213,8 @@
     <td>Android M Preview 3<br>Developer Docs</td>
     <td><a href="#top" onclick="onDownload(this)"
       >m-preview-3-developer-docs.zip</a><br>
-      MD5: -<br>
-      SHA-1: -
+      MD5: d99b14b0c06d31c8dfecb25072654ca3<br>
+      SHA-1: 9cefeeda07676130da606a1796e1c00fffc667c1
     </td>
   </tr>
 <table>
@@ -246,34 +247,34 @@
   <tr id="hammerhead">
     <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>
     <td><a href="#top" onclick="onDownload(this)"
-      >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>
-      MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>
-      SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939
+      >hammerhead-MPA44G-preview-3fff4cf7.tgz</a><br>
+      MD5: ce86cb083174fab9f52483fa0828b23f<br>
+      SHA-1: 3fff4cf707c2ce5a5efbb7238982a41d36bd7dcc
     </td>
   </tr>
   <tr id="shamu">
     <td>Nexus 6 <br>"shamu"</td>
     <td><a href="#top" onclick="onDownload(this)"
-      >shamu-MPZ79M-preview-e1024040.tgz</a><br>
-      MD5: 24a2118da340b9afedfbdfc026f6ff81<br>
-      SHA-1: e10240408859d5188c4aae140e1c539130ba614b
+      >shamu-MPA44G-preview-6ad5fb56.tgz</a><br>
+      MD5: d1ec118d4b7dc564f048542576885985<br>
+      SHA-1: 6ad5fb561e3ccc7fd8c12f8513984a64a0a265da
     </td>
   </tr>
   <tr id="volantis">
     <td>Nexus 9 <br>"volantis"</td>
     <td><a href="#top" onclick="onDownload(this)"
-      >volantis-MPZ79M-preview-9f305342.tgz</a><br>
-      MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>
-      SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7
+      >volantis-MPA44G-preview-7ff8343a.tgz</a><br>
+      MD5: 2f764a8d0b2c176ab723ed7e26907075<br>
+      SHA-1: 7ff8343a0545a142e6a84023940b75ab328b6ae8
     </td>
   </tr>
 
   <tr id="fugu">
     <td>Nexus Player <br>"fugu"</td>
     <td><a href="#top" onclick="onDownload(this)"
-      >fugu-MPZ79N-preview-fb63af98.tgz</a><br>
-      MD5: e8d081137a20b66df595ee69523314b5<br>
-      SHA-1: fb63af98302dd97be8de9313734d389ccdcce250
+      >fugu-MPA44G-preview-f9cc2862.tgz</a><br>
+      MD5: 876fdc064836fa7ddf33d34e04fbd772<br>
+      SHA-1: f9cc2862fa5314393ec5780a6a9e08f9a9aacf4d
     </td>
   </tr>
commit	42c22d04d9be578c4f32adfd43c1b37816a5c150	[log] [tgz]
author	Dirk Dougherty <ddougherty@google.com>	Sun Aug 16 22:26:03 2015 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Sun Aug 16 22:26:03 2015 +0000
tree	0ed686ac9ffbfc9db0667815fc8d93290929498d
parent	bf8f17f8dcfa0b923d7a8e16d85b09d61fdc39b9 [diff]
parent	49eeebb0a754670fcec38fdd54b33b348f861fd5 [diff]