| commit | 7cd99c47bb0cc2aa9c6c242f33c1752b60d09839 | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Sun Jan 31 00:40:24 2021 +0100 |
| committer | Jakub Pawlowski <jpawlowski@google.com> | Sun Jan 31 00:40:24 2021 +0100 |
| tree | 6e09579c50251b60b17baa2f7bb686c67795f4ce | |
| parent | 278b741e3accdd7cbf7117dd0771cd130f76ddb0 [diff] | |
| parent | 132a502721fcc76eb9ddce475642800956ba3173 [diff] |
resolve merge conflicts of 132a502721fcc76eb9ddce475642800956ba3173 to rvc-qpr-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I6cbbb7e2c680996bdd7b7f1d84bc14011451c7a5