diff options
| author | Aran Ink <nesciosquid@google.com> | 2019-06-21 10:39:23 -0400 |
|---|---|---|
| committer | Aran Ink <nesciosquid@google.com> | 2019-06-21 19:36:20 +0000 |
| commit | 5590c5610236ff354e0e2f2595ee17f88ea25fdd (patch) | |
| tree | 6258cc524f1eeb41b1adaccfb3048024c83379c0 /tools/aapt2/diff/Diff.cpp | |
| parent | c65d4b728cc525550afd34f6d627d2be619c2e69 (diff) | |
Fix conflict between metrics_constants and settings_enums.
Change-Id: I483bf6b26f2f258f2e2f6f3d839deee4953c203d
Test: Automated tests pass.
Fixes: 135720071
(cherry picked from commit 08659ccdb72b4c578e4b83fcc9e549a9c27f4b75)
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions