summaryrefslogtreecommitdiff
path: root/tools/aapt/ResourceTable.cpp
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2014-10-02 00:58:42 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-10-02 00:58:42 +0000
commit8c95b359da9a5d231c8dd8750f75b1d75d122aae (patch)
treecd519a2dd045959cba8e44d560fe3e37b6b77c0d /tools/aapt/ResourceTable.cpp
parentb3a90ee245a2a25d0be8fce5549c84f848b5a8e1 (diff)
parent940d3dd05554db4627f0704be4f73fb1a27ce479 (diff)
am 940d3dd0: (-s ours) am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '940d3dd05554db4627f0704be4f73fb1a27ce479': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions