| commit | 0bf6d01729e03cb8be66c128234e070f14816bb3 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Thu Feb 13 19:47:38 2020 -0800 |
| committer | Etan Cohen <etancohen@google.com> | Thu Feb 13 19:47:43 2020 -0800 |
| tree | 0543ca11dcc2b736c321fc2da6f16570e396f993 | |
| parent | ea28c5a250b9714c1f31921b1679d2443781cf84 [diff] | |
| parent | bc5182bb20f3907c841348c8456a406036e22975 [diff] |
resolve merge conflicts of bc5182bb20f3907c841348c8456a406036e22975 to qt-dev Bug: None Test: Trivial merge resolution Change-Id: I7c906295e30e0eb0b1f119fee9937d08aa2ae154