summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-16 13:16:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-16 13:16:45 -0700
commit60e13114eb806d50b7b362d39051c5c775704bf6 (patch)
tree7b53d402077177542434782d16e7e568399fad3f /graphics/java/android/renderscript/RenderScript.java
parent63446167b9d6d9ed3410320d17e8fe816caf6c42 (diff)
parent1d340a3c24913d8750900355cd92ef5742eea11f (diff)
am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '1d340a3c24913d8750900355cd92ef5742eea11f': DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions