commit | 731a7f38a9949bb9d15f9dd16514e7908c84ed9e | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 05 13:01:15 2017 +0100 |
committer | Nicolas Geoffray <ngeoffray@google.com> | Fri May 05 13:01:15 2017 +0100 |
tree | 46c95642cac926eaaae26d01ca986b0691bcfd21 | |
parent | 62c3698a79280fcf1188bfe861412bc87480b235 [diff] |
Remove line from bad resolution merge. Test: build Change-Id: Ie7f9187ecf63150b9ea36858e80e226c6daaa184