commit | ca1ba9ee45117735fdc35441f5b6c59c4bdeaa85 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:55 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:55 2020 +0000 |
tree | c021e106ee6994d745ac12d70722c0b986aa13ff | |
parent | 805e3a983f29539f3578087f1eabe2bf9d11ed5b [diff] | |
parent | 77fc5fd4ef4cc69c0cf67d3d146b85f94cad4fbd [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11a5 am: 76a81f920b -s ours am: 77fc5fd4ef -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: Ia16f9953063b682ac7be51eb1def7c4c3df8bf8f