summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Eric Fischer <enf@google.com> 2011-05-10 12:26:09 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-10 12:26:09 -0700
commitca43ef6bc7ea52efb17718017e1f883e33504c05 (patch)
treeb28c195791e857a0495ff64a659613405249807a /libs/utils/AssetManager.cpp
parent0fe56853fd88c34aba37b04be256a0e51c1bbff7 (diff)
parentaffca8fa11aa731cdc8b4b4f2b5478f182b9fbbf (diff)
am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'affca8fa11aa731cdc8b4b4f2b5478f182b9fbbf': Import revised translations. DO NOT MERGE
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions