| commit | 634fd70147de88f5cefa34123ef05b642e635007 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Tue Dec 04 14:07:05 2018 -0800 |
| committer | Hall Liu <hallliu@google.com> | Tue Dec 04 14:07:05 2018 -0800 |
| tree | 59669a15bb743429e2e7388a68898660194f4a0f | |
| 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