| commit | 8e30e885f56f84a80aaa84783545406cde0c8192 | [log] [tgz] |
|---|---|---|
| author | Sasha Smundak <asmundak@google.com> | Thu Apr 04 10:51:55 2019 -0700 |
| committer | Sasha Smundak <asmundak@google.com> | Thu Apr 04 10:51:55 2019 -0700 |
| tree | d673fe4b4935ccf537b372fc08a1a0fdfa9089b1 | |
| parent | 397b17a455ef918467f72032c9185f0a30d8000e [diff] | |
| parent | ffbf5776ef7cc60d1fc4dcaa0778bc430e9a4b40 [diff] |
resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I3db1d1964373bc2ec101d6fd05d8b62d7f095cfb