summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Eric Fischer <enf@google.com> 2011-05-10 14:27:23 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-10 14:27:23 -0700
commit6819c677b9d8d9a5f60f1a35e045300b1a8aec96 (patch)
treeb28c195791e857a0495ff64a659613405249807a /libs/utils/AssetManager.cpp
parentca43ef6bc7ea52efb17718017e1f883e33504c05 (diff)
parent98041f02b471b100056c3dc16e50f04a059f9a58 (diff)
am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '98041f02b471b100056c3dc16e50f04a059f9a58': Import revised translations. DO NOT MERGE
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions