summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Jake Hamby <jhamby@google.com> 2011-05-11 13:09:42 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-11 13:09:42 -0700
commitafd28ac6ecec88065968fff66b8fc1a10e8f28ac (patch)
tree7b737a5faacd76a6e6f2a1f477996ceb09d091df /libs/utils/AssetManager.cpp
parent2b50d884c957778a7eb6b3487b639192d43a2ff9 (diff)
parentee60f3fb1b4e61ac8027293a658ba710e36d36b6 (diff)
am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
* commit 'ee60f3fb1b4e61ac8027293a658ba710e36d36b6': Enable support for SMS national language shift tables.
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions