commit afb02269cfaed56240f695101ba599beae0c5952
author Jason Sams <jsams@google.com> Wed Nov 27 15:30:06 2013 -0800
committer Jason Sams <jsams@google.com> Wed Nov 27 15:30:06 2013 -0800
tree 3c53bbe4eb61525f738207c6d588cf1656b30161
parent 4f0be08f2be70b758d1b1308543f15824e4a0f9f
parent 1ccc6633bf47c95601cc13a2566c702bb8d986cd

Merge commit '1ccc6633' into manualmerge

Conflicts:
	graphics/java/android/renderscript/Double2.java
	graphics/java/android/renderscript/Double3.java
	graphics/java/android/renderscript/Double4.java
	graphics/java/android/renderscript/Float2.java
	graphics/java/android/renderscript/Float3.java
	graphics/java/android/renderscript/Float4.java
	graphics/java/android/renderscript/Int2.java
	graphics/java/android/renderscript/Int3.java
	graphics/java/android/renderscript/Int4.java
	graphics/java/android/renderscript/Long2.java
	graphics/java/android/renderscript/Long3.java
	graphics/java/android/renderscript/Long4.java
	graphics/java/android/renderscript/Short2.java
	graphics/java/android/renderscript/Short3.java
	graphics/java/android/renderscript/Short4.java

Change-Id: Ib9e940bc7d62764020eea7639d7158af707eb33f