summaryrefslogtreecommitdiffstats
path: root/include/camera/CameraParameters.h
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-08-20 09:33:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-20 09:33:10 -0700
commitd93ecb3fab669bb563fcb903966e854a593ceace (patch)
tree6b9a1ce457f91bcf535a2c41cff624ec6710024c /include/camera/CameraParameters.h
parent7e8f0c7454339d240761684807135fbc490e99f6 (diff)
parent581f78615a9dc65ee264b3619ef6cdd0b0e8355c (diff)
downloadframeworks_base-d93ecb3fab669bb563fcb903966e854a593ceace.zip
frameworks_base-d93ecb3fab669bb563fcb903966e854a593ceace.tar.gz
frameworks_base-d93ecb3fab669bb563fcb903966e854a593ceace.tar.bz2
am 581f7861: DO NOT MERGE Refactor find and select dialogs
Merge commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c' into gingerbread-plus-aosp * commit '581f78615a9dc65ee264b3619ef6cdd0b0e8355c': DO NOT MERGE Refactor find and select dialogs
Diffstat (limited to 'include/camera/CameraParameters.h')
0 files changed, 0 insertions, 0 deletions