summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-07-15 13:53:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-15 13:53:44 +0000
commit862ff6b6c8d513ca5cd79bb49194a5fe2543f9b5 (patch)
tree86e771795757c7ece7135bec9ef88eeac49dfb7e /tools/aapt2/diff/Diff.cpp
parent82ca8b0a6b55d45cb92664983092faf738139bf8 (diff)
parent94666b76988a6a6721a0d5c080f819580da912a2 (diff)
am 94666b76: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '94666b76988a6a6721a0d5c080f819580da912a2': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions