summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
author Wu-cheng Li <wuchengli@google.com> 2010-08-21 09:42:08 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-21 09:42:08 -0700
commit749406bfc39aa97a8ef07561d8cd93387716cd69 (patch)
tree07e69da39fdc565ffaf3f31fa5db6effdf1cca8e /libs/hwui/ProgramCache.cpp
parentfc5d0cf56401a56f58b12412617e4b84bea2771b (diff)
parent9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9 (diff)
am 9ba1ed6a: (-s ours) am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9' * commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9': Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
0 files changed, 0 insertions, 0 deletions