tree 35d03eedbd8fa2fefb1ba2375b299806959755ec
parent 57f2887c33080f9021a8aacce6a87db0214f5e29
parent 76b067590b2e9dc403c9edac58e414468c5e1104
author Teng-Hui Zhu <ztenghui@google.com> 1320346001 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320346001 +0000

am 76b06759: Merge "Create GL texture when it is missing for video layer" into ics-mr1

* commit '76b067590b2e9dc403c9edac58e414468c5e1104':
  Create GL texture when it is missing for video layer