summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Valentin Kravtsov <valentink@google.com> 2011-03-18 09:15:49 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-18 09:15:49 -0700
commit9f198e559812251550511cd86ba60285fec4f5fe (patch)
treeabb3eb43ca814a49ecc5d8c984405730266f881c /libs/utils/AssetManager.cpp
parent5d1e292b8824c8038e649d145f8bb1123b5149b5 (diff)
parenta06b350e554cf7f2fc150d2ee1e0d888e6e0f69e (diff)
am 000466d7: am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
* commit '000466d79d33fa302c6c8d20d2db45faca7c31e0': Fixing a race condition in RecognitionService
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions