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