summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceTextureClient.cpp
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-02-24 09:50:27 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-24 09:50:27 -0800
commit4de803c76d4afd0f542c086b555b71729b3c5796 (patch)
treec30833e99e2a2855b2739ef6bca3a884bfa0072a /libs/gui/SurfaceTextureClient.cpp
parent307f47aa5def85d0c0bb4af725ff557707c5be86 (diff)
parent459df4ef8368ea84ce7d07981c6867a7b7fef14e (diff)
am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '459df4ef8368ea84ce7d07981c6867a7b7fef14e': stagefright aacenc: Avoid warnings about incompatible pointer types
Diffstat (limited to 'libs/gui/SurfaceTextureClient.cpp')
0 files changed, 0 insertions, 0 deletions