summaryrefslogtreecommitdiffstats
path: root/opengl/tests
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-10-31 09:16:58 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-10-31 09:16:58 -0700
commite2d4cc28d72db0d49e61ed4ceeb878436cafb23a (patch)
tree75a8d94a5aed70341c739246b4221ce4e6993d90 /opengl/tests
parent5b47c5c574d8d3bf8e73ea4fd7a08e0d881d461c (diff)
parent4ea5d656db0f5fcc4ae6c792ec83e157a2c1bae8 (diff)
parentf9218b859144dd2d465e28a2709c845c591d5a4b (diff)
downloadframeworks_native-e2d4cc28d72db0d49e61ed4ceeb878436cafb23a.zip
frameworks_native-e2d4cc28d72db0d49e61ed4ceeb878436cafb23a.tar.gz
frameworks_native-e2d4cc28d72db0d49e61ed4ceeb878436cafb23a.tar.bz2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I4f96bf28f6585ad8331daeab60e6d23e92cf0c5d