summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-11-25 12:44:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-25 12:44:40 -0800
commitf6a1dab030095ad1ed58d387ff21a112bca5b610 (patch)
treef674876f941777dcc5b11d0e5558e692f261c524 /opengl/java/android/opengl/Texture.java
parent79347f94fa2b06425d1e6fdc766a2a22d88fb2c5 (diff)
parentf3e291a05d1e30fe409b06ca43538ca22ee2e69b (diff)
am f3e291a0: Merge change Id7b9903e into eclair-mr2
Merge commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b' into eclair-mr2-plus-aosp * commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b': Add setAttentionLight() to IPowerManager for the Phone app.
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions