| commit | 6be88efde54de8444ca0ad335fd5a7da0e4f085f | [log] [tgz] |
|---|---|---|
| author | Andrei Onea <andreionea@google.com> | Wed Aug 05 17:41:18 2020 +0100 |
| committer | Andrei Onea <andreionea@google.com> | Wed Aug 05 17:42:55 2020 +0100 |
| tree | 36627f9442df20556dcfaef5e2b5bc3ccb7ffaf8 | |
| parent | 655eb212ece51e389559a1708c69b039e97b9caa [diff] | |
| parent | c94e810cabc04da9e7327ef002a678486d8e1f6f [diff] |
resolve merge conflicts of c94e810cabc04da9e7327ef002a678486d8e1f6f to rvc-dev-plus-aosp Change-Id: I47128585a8259dc51f25d679d1841578138f9a1d