diff options
| author | Hall Liu <hallliu@google.com> | 2018-12-04 14:07:05 -0800 |
|---|---|---|
| committer | Hall Liu <hallliu@google.com> | 2018-12-04 14:07:05 -0800 |
| commit | 634fd70147de88f5cefa34123ef05b642e635007 (patch) | |
| tree | 59669a15bb743429e2e7388a68898660194f4a0f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 78128395e7795da8f4c14b41163e6d7e2a177f5d (diff) | |
DO NOT MERGE Fix build breakage
Remove the lines in system-current.txt that were mistakenly added during
conflict resolution.
Bug: 119675160
Test: compiles
Change-Id: I414ccc755e70675261c35fcdc38b98d310bb8f91
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions
