summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2011-09-27 16:35:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-27 16:35:57 -0700
commit92c400d6f2d86d487d5fcb038178d11e8473205f (patch)
tree0c45427a3cad09e3d6d923e747b957209c11ebb4 /Android.mk
parent412921983967b5019834c3b4f340d03b91f6dfa0 (diff)
parentd8e940a7722cb786af0f095f34618ed3b0ada281 (diff)
downloadLegacyCamera-92c400d6f2d86d487d5fcb038178d11e8473205f.zip
LegacyCamera-92c400d6f2d86d487d5fcb038178d11e8473205f.tar.gz
LegacyCamera-92c400d6f2d86d487d5fcb038178d11e8473205f.tar.bz2
am d8e940a7: Merge "Make sure correct GL context is active when tearing down effects." into ics-factoryrom
* commit 'd8e940a7722cb786af0f095f34618ed3b0ada281': Make sure correct GL context is active when tearing down effects.
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions