diff options
| author | Bill Yi <byi@google.com> | 2019-02-19 20:43:50 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-19 20:43:50 -0800 |
| commit | 5bc0784386379cf60562c5d9bcbda907f9779f00 (patch) | |
| tree | 2b005208b98c4bd6724e4382d022752830115e1c /tools/aapt2/diff/Diff.cpp | |
| parent | 73a9eacd3ed08393856a74064780c9e396c2c95f (diff) | |
| parent | 94f6de35be1d4d7c0498688e0ff99d692f22df19 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: c691b7e52c -s ours
am: 94f6de35be -s ours
am skip reason: subject contains skip directive
Change-Id: I4586d58180b40099fb0f5cdc0b4ba27b4d21356f
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions