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 | 851a5c882e545e880e27770436b730b3e1628e5e (patch) | |
| tree | 9535013ef46bc8c2bb119e23ead0c28f5b894a94 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5ff0512a0ebef56919f81011aaf854a545d42824 (diff) | |
| parent | 077e5b6a721c606c339d88de11ba640225a8e39f (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 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions