| commit | 50b7f18e23e1de0969b85666e086c94a6b0ef370 | [log] [tgz] |
|---|---|---|
| author | Xianyuan Jia <xianyuanjia@google.com> | Sat Nov 14 00:53:21 2020 +0000 |
| committer | Xianyuan Jia <xianyuanjia@google.com> | Sat Nov 14 00:57:29 2020 +0000 |
| tree | 7d20ef4551bdc14b464d58b96dd6f1a03e14b14b | |
| parent | e965ea14d551056f1f00d65c68f17581cbd6adb5 [diff] | |
| parent | 1f3ea81ab32a70da125c8f3c45782675a2d9b681 [diff] |
resolve merge conflicts of 1f3ea81ab32a70da125c8f3c45782675a2d9b681 to rvc-d1-dev-plus-aosp Change-Id: I2929b96b66a70b83975b7dfe3a597730beeedc69