summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2014-07-06 19:49:37 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-07-06 19:49:37 +0000
commitb33e23ead7e9b9a1327168ffcca48a3cbe668398 (patch)
tree6cc922b18cb72799525218d64e5dcb4757b03131 /libs/androidfw/AssetManager.cpp
parent660630f24251d62d13d13ce0301f5d2762414833 (diff)
parentabef99cf6a18873ff2079285d26755b41aed979b (diff)
am abef99cf: (-s ours) am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'abef99cf6a18873ff2079285d26755b41aed979b': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions