| commit | 089c58344f4e13abdefe04acd74065a5eacacebc | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 21 08:40:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:40:58 2020 +0000 |
| tree | 141b7f1dfc2300ad2965bc541f2ce57af9a85a7b | |
| parent | e147f93df617ad1db123d1fd42c780a2f6c72aa7 [diff] | |
| parent | 5490344493d453a8b21f21145e612e91c8dfc6d0 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11a5 am: 76a81f920b -s ours am: 77fc5fd4ef -s ours am: ca1ba9ee45 -s ours am: b75d08ff2c -s ours am: 5490344493 -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: I3f3fdabbf14382aab019a2cd28d33c9e55f7adf8