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