diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-29 14:42:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 14:42:26 +0000 |
commit | ab38b8e5ea4149dcc8447f90dcaf6d5c250da416 (patch) | |
tree | 27538a6101c75339440c743ff698bddea7539dc9 /tools/aapt2/diff/Diff.cpp | |
parent | 23de74aed5d25152b788e063da8f6a2ed19cd222 (diff) | |
parent | 42e73a82361e8161660e2af9e683edd496c18eeb (diff) |
am 42e73a82: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '42e73a82361e8161660e2af9e683edd496c18eeb':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions