diff options
| author | Bill Yi <byi@google.com> | 2019-04-17 15:44:35 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-17 15:44:35 -0700 |
| commit | 3129b6bbf559c76db2022eab71903b3201a3b010 (patch) | |
| tree | b784273b201df5f9a71ac4e18b6053bfebbd4e71 /tools/aapt2/diff/Diff.cpp | |
| parent | f3523afaecc77e3b2a85470b50239fd05b254d5d (diff) | |
| parent | 6805b6ae0d574f44fd7985e76bd6b9556f390312 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 6805b6ae0d -s ours
am skip reason: subject contains skip directive
Change-Id: I07dc9d77806dc7218dcac75e97ca025e176ebda7
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions