commit | 602f36a0a5f95bfb933550d53d3f203e7baea9fd | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:51 2020 +0000 |
tree | c021e106ee6994d745ac12d70722c0b986aa13ff | |
parent | b75d08ff2ccb06c24292de7951a3f34d90766ec5 [diff] | |
parent | c00dfe5d95342ee2e16e7da4bf89bf62557f1909 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a899bb461 am: d3865b7a63 -s ours am: c4eabe78c5 -s ours am: c00dfe5d95 -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: I42caf6fa0e5a430001a3097eb4f57bcf267daaa4