summaryrefslogtreecommitdiffstats
path: root/include/gui/SurfaceTexture.h
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-03-16 11:00:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-16 11:00:33 -0700
commit262564df9613e8950fb3828ecc6dfffe79cc1b31 (patch)
tree7ac9370ca7c7c394befb6615800cd3e0bb1edf09 /include/gui/SurfaceTexture.h
parent63fce8c56d72c28fcf9c3edac9263dd7c49cb132 (diff)
parentd40e0efb024ad2e276dbbd2eb81047dd2a1319f7 (diff)
downloadframeworks_base-262564df9613e8950fb3828ecc6dfffe79cc1b31.zip
frameworks_base-262564df9613e8950fb3828ecc6dfffe79cc1b31.tar.gz
frameworks_base-262564df9613e8950fb3828ecc6dfffe79cc1b31.tar.bz2
am d40e0efb: (-s ours) am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'd40e0efb024ad2e276dbbd2eb81047dd2a1319f7': Import revised translations. DO NOT MERGE
Diffstat (limited to 'include/gui/SurfaceTexture.h')
0 files changed, 0 insertions, 0 deletions