summaryrefslogtreecommitdiffstats
path: root/libs/camera/CameraParameters.cpp
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-04-10 11:54:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:54:56 -0700
commitf63d616b38ac25b4a9ffef6d1366435e17fb4572 (patch)
tree7ef5429eaa4181c78b79ef7d1476bea87de134e9 /libs/camera/CameraParameters.cpp
parent7c48d939e20727f83bfd2d41057e7bb1542b85f2 (diff)
parent8e60e09219bc1bfd8a3d514db919a5f7b69fcca3 (diff)
downloadframeworks_base-f63d616b38ac25b4a9ffef6d1366435e17fb4572.zip
frameworks_base-f63d616b38ac25b4a9ffef6d1366435e17fb4572.tar.gz
frameworks_base-f63d616b38ac25b4a9ffef6d1366435e17fb4572.tar.bz2
am 8e60e092: am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Diffstat (limited to 'libs/camera/CameraParameters.cpp')
0 files changed, 0 insertions, 0 deletions