summaryrefslogtreecommitdiff
path: root/tools/aapt/ResourceTable.cpp
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2014-11-10 17:31:24 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-11-10 17:31:24 +0000
commit20083734d92eb893c36278d2486404eedc0cc1f9 (patch)
tree5bf464ae88800985e1235a45247e5512a02ffd77 /tools/aapt/ResourceTable.cpp
parent78a853d17a33958ebc7d014cc6ec3998696302d3 (diff)
parent8f02ec4fce4a77c78eff04b709831e0f4ec7cb43 (diff)
am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '8f02ec4fce4a77c78eff04b709831e0f4ec7cb43': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions