| commit | ea2314c84f0882eba0be193554ad691d56fe5f69 | [log] [tgz] |
|---|---|---|
| author | Julia Tuttle <juliatuttle@google.com> | Wed Aug 14 12:25:38 2019 -0400 |
| committer | Julia Tuttle <juliatuttle@google.com> | Wed Aug 14 12:25:48 2019 -0400 |
| tree | 24ba0269e32ee75972c0d96dad719b5005a50513 | |
| parent | 3e7ce55b520f94a97ba120e958a333935371bb87 [diff] | |
| parent | 07d866a10e2633902270173108eb6d9d53e31eac [diff] |
resolve merge conflicts of 07d866a10e2633902270173108eb6d9d53e31eac to qt-qpr1-sysui-dev Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Icfe845572ea5654aae145e771a593cd66eff2305