| commit | 25f52c476ab3c589de664894922e94aa3dd58a3e | [log] [tgz] |
|---|---|---|
| author | Alexander Dorokhine <[email protected]> | Thu Oct 01 08:30:14 2020 +0000 |
| committer | Alexander Dorokhine <[email protected]> | Thu Oct 01 08:30:25 2020 +0000 |
| tree | 6acc9b1e675d31232de211628c4d59e3978cfe80 | |
| parent | 574b8d1b09dae7b76e6814cddc27a68f5562ae72 [diff] | |
| parent | 1d475d7836df549c77ee002ed760601517f4bdc3 [diff] |
resolve merge conflicts of 1d475d7836df549c77ee002ed760601517f4bdc3 to rvc-qpr-dev-plus-aosp Change-Id: I37db2ded60b83f096a54f6594eb94fedcd09ed76