summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2015-03-30 15:03:29 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-03-30 15:03:29 +0000
commit27e3514e55df90ee183d939ef10b18a4bf773bce (patch)
tree4e385084f4b557d2d56a6cd62940c5f4cc20d5d4 /tools/aapt2/ResourceParser.cpp
parent20ec48bd0037108a4b2273ef6fa38d7562f33c56 (diff)
parentb64b78856cf6121e9956f8910f30656ebde5d024 (diff)
am b64b7885: (-s ours) am 6e22b329: (-s ours) am 6e6250b9: (-s ours) Import translations. DO NOT MERGE
* commit 'b64b78856cf6121e9956f8910f30656ebde5d024': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions