summaryrefslogtreecommitdiff
path: root/libs/camera/Camera.cpp
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2010-05-07 10:25:41 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-07 10:25:41 -0700
commita0a126a060b6b9ba51bc99f82ff4d322f779325e (patch)
tree2187fd23bd5fa69fcc8f9176e9f90851fe4456be /libs/camera/Camera.cpp
parent4405a0fefb63ebe4fe54ce54a64d3f37848c1285 (diff)
parente34d31e690cdfc529fe8e1e8f70e50c3719a4ccc (diff)
am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc' into kraken * commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc': Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Diffstat (limited to 'libs/camera/Camera.cpp')
0 files changed, 0 insertions, 0 deletions