| commit | f297e4494a3a67bd41796f35cfbf5f89d57c4936 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Fri Oct 30 20:39:32 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 30 20:39:32 2020 +0000 |
| tree | 4c37f4d0b3541866f7abfce51017efca5f275034 | |
| parent | 18a450a92b6c91fb7897c2444450dd3a8aea8269 [diff] | |
| parent | 024ea641dbb613dbcd3a6cdbc2494f31adc9b920 [diff] |
Merge "resolve merge conflicts of 887f4fbc740f2de31205d8e37e664b6813e9638f to rvc-qpr-dev-plus-aosp" into rvc-qpr-dev-plus-aosp