summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Eric Fischer <enf@google.com> 2011-05-11 13:09:13 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-11 13:09:13 -0700
commit2b50d884c957778a7eb6b3487b639192d43a2ff9 (patch)
treef0e900d3d2671d56e8003a8324f087737265d536 /libs/utils/AssetManager.cpp
parent989523fd44b7dc10deedc926d908ec2c9f035aa7 (diff)
parent6819c677b9d8d9a5f60f1a35e045300b1a8aec96 (diff)
am 6819c677: (-s ours) am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '6819c677b9d8d9a5f60f1a35e045300b1a8aec96': Import revised translations. DO NOT MERGE
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions