diff options
| author | Bill Yi <byi@google.com> | 2019-04-17 15:34:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-17 15:34:34 -0700 |
| commit | 32ea7cb8c82494db01e4cb1ddfa39b21e9454b83 (patch) | |
| tree | 1ec3ac01571e48fe39f020b349e074c0ad5ccc71 /tools/aapt2/diff/Diff.cpp | |
| parent | e3ddaa4dd5a47c80150b01474d5fd6cd62b55b70 (diff) | |
| parent | 3afd77d2d2c5061b5ddd5c141138aaf92d5205f5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 3afd77d2d2 -s ours
am skip reason: subject contains skip directive
Change-Id: I2a0313a2a684147148a4188b760f367db87b7b7d
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions