| commit | 3b87854adbf738657d2136cfc2f6c99daf97e5f4 | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Fri Jul 19 16:58:01 2019 -0400 |
| committer | Dave Mankoff <mankoff@google.com> | Fri Jul 19 16:58:01 2019 -0400 |
| tree | 40a809a3c5f3822a255fcba49175730559a09b81 | |
| parent | a50e7bb20dc75c865ea0b535a34090700b9db318 [diff] | |
| parent | 8d7481f01e59c9538417ef603751b132d853035a [diff] |
resolve merge conflicts of 8d7481f01e59c9538417ef603751b132d853035a to qt-r1-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Ie3a1b2fbdf159c8cc6f50f0426930eedae458a09