summaryrefslogtreecommitdiff
path: root/libs/camera/Camera.cpp
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2010-05-07 10:23:34 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-07 10:23:34 -0700
commite34d31e690cdfc529fe8e1e8f70e50c3719a4ccc (patch)
tree0c2ee2d44fac6950de2e314cbdb9e925ea7306cf /libs/camera/Camera.cpp
parent9609cdc8522414b61ffb7d31b4ceb2007f205129 (diff)
parente616553ebc895bef22b7e9e1d1d4b6cffdbe82fe (diff)
am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe' into froyo-plus-aosp * commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe': Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Diffstat (limited to 'libs/camera/Camera.cpp')
0 files changed, 0 insertions, 0 deletions