summaryrefslogtreecommitdiff
path: root/libs/ui/CameraParameters.cpp
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2010-01-29 13:47:28 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-01-29 13:47:28 -0800
commit329df1b5b0d745b6e9fec58c0c235961245ac182 (patch)
treef4d901d22f470e7d421cde73033da6a191f7db17 /libs/ui/CameraParameters.cpp
parentf1e2b83c0ad6dbfc35b3c29c1c1129154ff5826a (diff)
parentaa51f1a2428ad82500b00bd98b9ce710d2f091a3 (diff)
am 196ec566: Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair
Merge commit '196ec566b39340942f146ce4a9af775f4c648d2d' into eclair-plus-aosp * commit '196ec566b39340942f146ce4a9af775f4c648d2d': SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Diffstat (limited to 'libs/ui/CameraParameters.cpp')
0 files changed, 0 insertions, 0 deletions