| commit | b7f2899ecdd85546a20f73ce33f958442f46f6fb | [log] [tgz] |
|---|---|---|
| author | Ulya Trafimovich <skvadrik@google.com> | Mon May 17 16:58:00 2021 +0100 |
| committer | Ulya Trafimovich <skvadrik@google.com> | Mon May 17 17:40:39 2021 +0100 |
| tree | acb81afe30784c47253c4bb9ee7bedf0318a50f4 | |
| parent | ff992b8c2527c92321b3420c40cb56358d29071e [diff] |
resolve merge conflicts of ff992b8c2527c92321b3420c40cb56358d29071e to master Test: lunch cf_x86_64_phone-userdebug && m Change-Id: I2da4e61eaddd61e5eac8275e6bc33e8528c2238a