summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Eric Fischer <enf@google.com> 2011-03-04 13:56:52 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-04 13:56:52 -0800
commit1deaf0201aa9d9be5918cf1f966fdd5633d2485f (patch)
treed643aa7a1f55424c74f2d503ad41dacfb45e5fb6 /libs/utils/AssetManager.cpp
parent6d42d8efdc1e95bdb7d582fd018d099edfa7c1f2 (diff)
parent0274b3a554fbaa00b7033c4af7481ec6e11128b3 (diff)
am 2f314844: (-s ours) am 4d3e7fb7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '2f3148445ff7d6df74b7a1b07858c379157e12df': Import revised translations. DO NOT MERGE
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions