summaryrefslogtreecommitdiff
path: root/libs/surfaceflinger/TextureManager.cpp
diff options
context:
space:
mode:
author Suchi Amalapurapu <asuchitra@google.com> 2010-05-18 14:55:48 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-18 14:55:48 -0700
commit503fd99039e61035234be47db9e76bcd92f12194 (patch)
tree6993687d0c39d4fe3303d40166c0ad7450e9e969 /libs/surfaceflinger/TextureManager.cpp
parent77ee720aad0d5d650f30d213d195b39c11c39a05 (diff)
parentaa2c917926843447adccbceb32318b584e1fe245 (diff)
am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken * commit '7361b7410f2427022cc8917b00553dc26107cded': Uncomment a test that was marked as STOPSHIP
Diffstat (limited to 'libs/surfaceflinger/TextureManager.cpp')
0 files changed, 0 insertions, 0 deletions