diff options
author | 2012-12-10 15:23:22 -0800 | |
---|---|---|
committer | 2012-12-10 15:23:22 -0800 | |
commit | acdbbdcecb6e09b8fc4372cf4b9db69823aec31e (patch) | |
tree | 07a99dcb8fb1c21b0995f991f479859f25f39bd8 /libs/gui/SurfaceTexture.cpp | |
parent | 92573f1ba0d5360d7bfa8ab8935118db7a251f62 (diff) | |
parent | 064d252918c23cc4c90f8bc62f9ae47ba7afa4d5 (diff) |
am 064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '064d252918c23cc4c90f8bc62f9ae47ba7afa4d5':
Diffstat (limited to 'libs/gui/SurfaceTexture.cpp')
0 files changed, 0 insertions, 0 deletions