diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-24 10:17:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 10:17:03 -0700 |
| commit | 1770b21ab597e059eb54c9ef268c6ba9a38116d2 (patch) | |
| tree | e235315395cbb5be9dcb6ee1952b7ae6ba5acb4e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b422ca809c92e3136bdf1f3820c4d59c61bc8e57 (diff) | |
| parent | 0460e26a4c9915f77c915d2cc3540969802b02fa (diff) | |
am 0460e26a: resolved conflicts for merge of 691be97f to gingerbread-plus-aosp
Merge commit '0460e26a4c9915f77c915d2cc3540969802b02fa'
* commit '0460e26a4c9915f77c915d2cc3540969802b02fa':
add new sensor types for handling gyro data and device orientation
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions