| commit | 6ef67bbd6c06d2a78d2d37480bac98fb213cf349 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Wed Jan 20 01:10:31 2021 +0000 |
| committer | Hall Liu <hallliu@google.com> | Wed Jan 20 01:10:40 2021 +0000 |
| tree | 09a1d285abeda02690cc1afa1612a8971ac5f2f3 | |
| parent | 73326c9ebe58a60e1b472a4cbb30ff23cd0f27c5 [diff] | |
| parent | 869fe2b5487ef587b19aacb8e02310cb424f08c5 [diff] |
resolve merge conflicts of 869fe2b5487ef587b19aacb8e02310cb424f08c5 to rvc-qpr-dev-plus-aosp Change-Id: Ie60e988df7d0dc1a48bb85e8f5cdfccd549ff319