tree 2a3d4a6e943e19889957188c2fad2bf247321b31
parent 03b189c3be48bed0ae18b957fca949c447e634d8
parent 017f45f40d88c3d316587c428962d98d10ec56ad
author Bill Yi <byi@google.com> 1609946472 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609946472 +0000

[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: da4b51ba32 am: 9da9d5df0a -s ours am: 017f45f40d -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1541047

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5d18bedad0b892d2f05eb19912a8d6ea15b6b67