commit | f3c61c6657fb2a25e5ac04e55ce0d7eefabc07f7 | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Thu Sep 19 14:59:54 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 19 14:59:54 2013 -0700 |
tree | a39f369de7b7aae66efd0489ec95a132b1654d6f | |
parent | 20021b300fa8c91559a555ac805f5bf8f6f88285 [diff] | |
parent | a84ca8a3ca2525855e705c13666bc5da2eaf3260 [diff] |
am a84ca8a3: Merge "TextureView/GLES20Canvas: Support synchronous GLConsumers" into klp-dev * commit 'a84ca8a3ca2525855e705c13666bc5da2eaf3260': TextureView/GLES20Canvas: Support synchronous GLConsumers