| commit | 7a3434e08ec11a9e3fc0a955b1d61d7798422156 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Mon Aug 03 06:24:18 2020 +0000 |
| committer | Lajos Molnar <lajos@google.com> | Sun Aug 02 23:35:10 2020 -0700 |
| tree | 1a1373325adb88e4c1c5d88051e6523dd77488a5 | |
| parent | a1c2dbc94e3c369e1b4d1fffd3307129e8d9bb1f [diff] | |
| parent | ae811bc80623da71374c555b51c2dde256b93d4d [diff] |
resolve merge conflicts of ae811bc80623da71374c555b51c2dde256b93d4d to rvc-dev-plus-aosp Change-Id: I555ff20739fe7e2ed195d1e670ebec5f1da4aaf0