| commit | b8911296b79144b9c452b4ca4e3162e4ace4bd0c | [log] [tgz] |
|---|---|---|
| author | Schneider Victor-tulias <victortulias@google.com> | Thu May 27 16:50:53 2021 -0700 |
| committer | Schneider Victor-tulias <victortulias@google.com> | Fri May 28 00:03:22 2021 +0000 |
| tree | fac7d14fa71d4d82be16e2ed528d940f1b5e51dd | |
| parent | e7e67f26cc3d2c411c181a72c23bf8886b5f5abe [diff] | |
| parent | af76459cc48590968328c934c550b01222e37c06 [diff] |
resolve merge conflicts of af76459cc48590968328c934c550b01222e37c06 to sc-v2-dev-plus-aosp Test: manual Bug: none Change-Id: I2dd82b1601bacab36cc589523780ca1166270223