summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-02 17:59:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-02 17:59:51 -0700
commit6b3357b33d3c904d2970b673d689762a4fe35c55 (patch)
tree365957e2f10f97798d21ec768eca47c686f90315 /opengl/tests/gl_basic/gl_basic.cpp
parentfea9e0cd37b547060b36ecd9abcbd8508bb30279 (diff)
parent4afe8c4e7a5e5e559c9ce0880a824bb8ee136f3c (diff)
am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread
Merge commit '31103928ed5b9091bcd7de74c8a49675d10c87e7' * commit '31103928ed5b9091bcd7de74c8a49675d10c87e7': Implement #2964234: Add support for <uses-package> element to aapt
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions