summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-16 13:11:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-16 13:11:27 -0700
commite5eb6a9e019e4fc161b24ba18fc21aaf00e91505 (patch)
treead6dc834b127811bd262b9b7eb76b729a290f8cc /graphics/java/android/renderscript/RenderScript.java
parentb0acb1e890959b616925ac89cbcdd22ed25e3252 (diff)
parent63446167b9d6d9ed3410320d17e8fe816caf6c42 (diff)
am 63446167: (-s ours) am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2
* commit '63446167b9d6d9ed3410320d17e8fe816caf6c42': DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions