| commit | f26b795c041ebb3f3cbe6a95cd2f69d440b71cb9 | [log] [tgz] |
|---|---|---|
| author | Siarhei Vishniakou <svv@google.com> | Sat Mar 21 05:57:55 2020 +0000 |
| committer | Siarhei Vishniakou <svv@google.com> | Sat Mar 21 06:08:47 2020 +0000 |
| tree | c8f33d0c4e340c15eeaa0ba5407645092030902a | |
| parent | 4846c5e3a95d4221f3667d62110a717dd9796d9b [diff] | |
| parent | 7e0769b219257a5053ad79160574892c5aca9ca2 [diff] |
resolve merge conflicts of 7e0769b219257a5053ad79160574892c5aca9ca2 to rvc-dev Bug: 148311342 Change-Id: I99d6296b8947ba85573a11fc5d07583326dd15da