| commit | c60ca1afdaf7dfe8383fe46e0ecb127d42dbe941 | [log] [tgz] |
|---|---|---|
| author | Cody Kesting <ckesting@google.com> | Mon Jun 22 14:24:46 2020 +0000 |
| committer | Cody Kesting <ckesting@google.com> | Mon Jun 22 14:31:05 2020 +0000 |
| tree | 0cc68b3871f84e5f5d2a9c12a2c0917c399d6af7 | |
| parent | f42e51ec459bedf0cb6a11118334c3ffa73e00bd [diff] | |
| parent | 9e491121c5e77a11a0595d7613e5d483890b4997 [diff] |
resolve merge conflicts of 9e491121c5e77a11a0595d7613e5d483890b4997 to rvc-dev-plus-aosp. Caused by aosp/1316384 Bug: 148032944 Bug: 151332031 Change-Id: I7cc024249afb59631820819fed62c2417ffbd05e