commit | 77fc5fd4ef4cc69c0cf67d3d146b85f94cad4fbd | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:32 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:32 2020 +0000 |
tree | c021e106ee6994d745ac12d70722c0b986aa13ff | |
parent | 5bb09173658e17de600fd636371760a7b93e027f [diff] | |
parent | 76a81f920b4602ccafab6fb03906e69f2dea200a [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 0139ad11a5 am: 76a81f920b -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: I64353b100715073be826edd7b15c9dcffa90006e