diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 13:18:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-16 13:18:54 -0700 |
| commit | dffa4761c8e238a925dcd7a4d23f044e2817d5e5 (patch) | |
| tree | ad6dc834b127811bd262b9b7eb76b729a290f8cc /graphics/java/android/renderscript/RenderScript.java | |
| parent | e5eb6a9e019e4fc161b24ba18fc21aaf00e91505 (diff) | |
| parent | 60e13114eb806d50b7b362d39051c5c775704bf6 (diff) | |
am 60e13114: (-s ours) am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2
* commit '60e13114eb806d50b7b362d39051c5c775704bf6':
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