| commit | 9dd3a7b6a03be84dffd66c95e41868b3580cc6cb | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Mon Feb 01 08:19:47 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 01 08:19:47 2021 +0000 |
| tree | 6e09579c50251b60b17baa2f7bb686c67795f4ce | |
| parent | 44b9940c4a19c1f3c01838951fa3cb1358d329f0 [diff] | |
| parent | 7cd99c47bb0cc2aa9c6c242f33c1752b60d09839 [diff] |
Merge "resolve merge conflicts of 132a502721fcc76eb9ddce475642800956ba3173 to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp