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
commitdc128f220b59f04eeca46d3c19a71beefabde64f (patch)
tree8dc1359d81604bdb5b4777aa34558617e3bd1945 /libs/utils/AssetManager.cpp
parent99c8ce82757aff10ff9eef863b5b7375f5f3123e (diff)
parent49b2ebe8b3521ccc552949fc242a5a4f29b4e72a (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