| commit | 024ea641dbb613dbcd3a6cdbc2494f31adc9b920 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Fri Oct 30 16:57:52 2020 +0000 |
| committer | Anton Hansson <hansson@google.com> | Fri Oct 30 17:02:14 2020 +0000 |
| tree | 036fa51ea5a780fac26aa3a12d5acb005a07a2de | |
| parent | ec0c0bde4c39da5331be6f0647285ab19d7e2de5 [diff] | |
| parent | 887f4fbc740f2de31205d8e37e664b6813e9638f [diff] |
resolve merge conflicts of 887f4fbc740f2de31205d8e37e664b6813e9638f to rvc-qpr-dev-plus-aosp Bug: 171029603 Test: No Change-Id: I94146ebaf21cabd54105059fee3f07ba4043aa76 Merged-In: I843efb4880b6caaf3872e9b0918fd710fb93d979