summaryrefslogtreecommitdiff
path: root/tools/aapt/XMLNode.cpp
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2014-10-01 22:02:40 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-10-01 22:02:40 +0000
commitf9c288995d22117ff023b7e7e9417c04cc2563e2 (patch)
tree877b4a38d48bd284ea81bd11800a2e5aee4cc897 /tools/aapt/XMLNode.cpp
parent37fdb6e981d7dabf461458042bf837a6da2f0007 (diff)
parenteb68a1f0266403c48215e9aa72bddfac8afd8a87 (diff)
am eb68a1f0: (-s ours) am 576e8450: (-s ours) am eb1618cf: (-s ours) am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'eb68a1f0266403c48215e9aa72bddfac8afd8a87': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt/XMLNode.cpp')
0 files changed, 0 insertions, 0 deletions