summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2012-07-16 18:15:45 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-07-16 18:15:45 -0700
commit7d5c51117dae79665660df28a0f3b24e6fe75fbd (patch)
tree6d0a438fb1cab0708e5a599611285a5d29086330 /opengl/java
parentc36b8acd1e850619de0bbf678b9573d4d761d836 (diff)
parent3c04cc44c400d0ed2155428fa50d5facc91cd893 (diff)
am 3c04cc44: Merge "Don\'t talk about Froyo as if it\'s still in the future."
* commit '3c04cc44c400d0ed2155428fa50d5facc91cd893': Don't talk about Froyo as if it's still in the future.
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions