summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-12-03 11:18:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-03 11:18:48 -0800
commit44000eb2a2340b1a47eaa587d4829810e04cbcdc (patch)
tree5dfe03faff6ecb08b266d93ddb696c94fca86da1 /opengl/java/android/opengl/Texture.java
parent1b794bbbdc961558a9f0ee956d9d3f684d1f0497 (diff)
parent678c2e35768a5426b4ad8f67c836008e7751a353 (diff)
am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2 * commit '678c2e35768a5426b4ad8f67c836008e7751a353': Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions