summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.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
commitbd08c07d9dda3e346db957041591194d00c60386 (patch)
tree031f03af99732267299954bd3ecab17ec2a7ee8f /libs/utils/AssetManager.cpp
parentbb52cb2555551f36932620a9c6b6fb443f0bce0f (diff)
parentcea4d290c031f27f1aacbf4bd577ed1f01c76844 (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/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions