| commit | 25b5637e76116132009d23f9e0d0925e0e7154cc | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 03 00:11:28 2019 -0700 |
| committer | Xin Li <delphij@google.com> | Mon Jun 03 00:11:28 2019 -0700 |
| tree | 9a6396fe3c5d372535992837cc0c8b176341c03a | |
| parent | 88a71be7624abd5f7b087bfe08fb9512dbb5c429 [diff] | |
| parent | f3206c03ec5943773dae28870ae8eaba2a8a8d20 [diff] |
resolve merge conflicts of f3206c03ec5943773dae28870ae8eaba2a8a8d20 to qt-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I9428910253b862d2f488c73731b1be05db6adf60