8967ffa - device/google/trout - Git at Google

commit: 8967ffac4ee2bafd39739896679b7df42f82b189
[log]
author: Yiming Jing <yimingjing@google.com>
Thu Apr 15 05:10:25 2021 +0000
committer: Yiming Jing <yimingjing@google.com>
Thu Apr 15 05:10:25 2021 +0000
tree: aa93ed85fc3225e1446838c4ab539cd63fe3a26b
parent: 1b8b5d69ee0f027dc6ec1a541c84664b618cb4d7 [diff]

Revert "resolve merge conflicts of b470e868c1587930cc72abf6571f3f3130517f61 to rvc-qpr-dev-plus-aosp"

This reverts commit 1b8b5d69ee0f027dc6ec1a541c84664b618cb4d7.

Reason for revert: subsequent merge conflicts

Change-Id: Ic28f32cd0a6f39a8280355939f6c03067f2267bb

5 files changed

tree: aa93ed85fc3225e1446838c4ab539cd63fe3a26b