summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceTextureClient.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2011-12-09 14:58:07 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-12-09 14:58:07 -0800
commit9c31b9e7238740da1f803b29cb3479ce14d549ee (patch)
tree8cef08e323746a2ae01800c70e083ad67d7fcb9a /libs/gui/SurfaceTextureClient.cpp
parent001e423026738b76f0a116f17bb9e3026a55a1dc (diff)
parent65e2784b8ae783c04f17283f5ca61c57b974f772 (diff)
am abe0ed49: am 641a5624: Reconcile with ics-mr0-release
* commit 'abe0ed4916537bf7244a4723e374591bfcf7e967':
Diffstat (limited to 'libs/gui/SurfaceTextureClient.cpp')
0 files changed, 0 insertions, 0 deletions