summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.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
commit81b3d23bd07b9c955be9c0b1933912eca22a1327 (patch)
treea338e707a1837b40f2a00b82b44be4d9b446e457 /libs/utils/AssetManager.cpp
parentb1ad26bc8d292aa50151ede9b6976079630df3bf (diff)
parentbd08c07d9dda3e346db957041591194d00c60386 (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/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions