tree d673fe4b4935ccf537b372fc08a1a0fdfa9089b1
parent 397b17a455ef918467f72032c9185f0a30d8000e
parent ffbf5776ef7cc60d1fc4dcaa0778bc430e9a4b40
author Sasha Smundak <asmundak@google.com> 1554400315 -0700
committer Sasha Smundak <asmundak@google.com> 1554400315 -0700

resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3db1d1964373bc2ec101d6fd05d8b62d7f095cfb