summaryrefslogtreecommitdiffstats
path: root/opengl/java
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2013-04-18 20:43:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-18 20:43:25 +0000
commitd3f9ffe28d1599e40f8c9a7c0c32465324bb2828 (patch)
treea621c588f0003849c1696c35f07e3a973fc54abe /opengl/java
parent5d1a182a8a2dd9613ef3b1f2de7b6a3d690ae890 (diff)
parentee5b2c6de7fb32d945a5a1303012a5f94b719dfa (diff)
downloadframeworks_base-d3f9ffe28d1599e40f8c9a7c0c32465324bb2828.zip
frameworks_base-d3f9ffe28d1599e40f8c9a7c0c32465324bb2828.tar.gz
frameworks_base-d3f9ffe28d1599e40f8c9a7c0c32465324bb2828.tar.bz2
Merge "Prevent transformed ops from merging in the first place" into jb-mr2-dev
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions