tree 1b062f277b2cd983b01e64276e1207dcbfae3a92
parent 3281e721c785304613c44853fc506b43cfea343c
parent 0c5c7d2b119d2350c186ae9902919bcf28c3e277
author Pannag Sanketi <psanketi@google.com> 1314224287 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314224287 -0700

Merge "Testing the GL/ CPU encoding w/ Gralloc buffers"