diff options
| author | Jason Sams <jsams@google.com> | 2013-11-27 15:30:06 -0800 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2013-11-27 15:30:06 -0800 |
| commit | afb02269cfaed56240f695101ba599beae0c5952 (patch) | |
| tree | 3c53bbe4eb61525f738207c6d588cf1656b30161 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 4f0be08f2be70b758d1b1308543f15824e4a0f9f (diff) | |
| parent | 1ccc6633bf47c95601cc13a2566c702bb8d986cd (diff) | |
| download | frameworks_base-afb02269cfaed56240f695101ba599beae0c5952.zip frameworks_base-afb02269cfaed56240f695101ba599beae0c5952.tar.gz frameworks_base-afb02269cfaed56240f695101ba599beae0c5952.tar.bz2 | |
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
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions