| commit | c00dfe5d95342ee2e16e7da4bf89bf62557f1909 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:01:18 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:01:18 2020 +0000 |
| tree | c021e106ee6994d745ac12d70722c0b986aa13ff | |
| parent | ca1ba9ee45117735fdc35441f5b6c59c4bdeaa85 [diff] | |
| parent | c4eabe78c5adeec41d1044458ab24ed929b757e7 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461 am: d3865b7a63 -s ours am: c4eabe78c5 -s ours am skip reason: Change-Id I58a59150174f298ff6e2fae9cd5b4a761279458f with SHA-1 5bb0917365 is in history Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1431509 Change-Id: I104d03755da300ba9149ef9836cc488d658aed54