tree cea50b32731921d70c08320f327181c7a538b2cc
parent 81013a87905049281289033ecee8c4bf9293f5c0
parent 90f7c51a5e4be73ad105adfcdc1af87b0722ef78
author Xin Li <delphij@google.com> 1607572018 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607572018 +0000

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 8062d41c2c -s ours am: 90f7c51a5e -s ours

am skip reason: Change-Id Ice614fa459cc9f91c68c74f6077f24e9ba7c1a4c with SHA-1 75e5aaa729 is in history

Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/1520609

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4d15f07fdb6d874086fd18aa971bbc7153c97fd