diff options
| author | Bill Yi <byi@google.com> | 2019-04-17 15:20:24 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-17 15:20:24 -0700 |
| commit | 2c72826c00c8d91543e63fd9fc4ea9557cae9f64 (patch) | |
| tree | badcd70c0b0b851fd05e3729add1e35dcdd287ac /tools/aapt2/diff/Diff.cpp | |
| parent | 4d2db2706a53dd7768fdbbffe616a2bec6fe548f (diff) | |
| parent | ad979f6c969b88c29a668df2c94f4181811c8067 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: ad979f6c96 -s ours
am skip reason: subject contains skip directive
Change-Id: If093aecab9eaa250218c8f5203aff1b86252caf3
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions