tree 14c963da1fec0a62377183704ae44846928381c2
parent 3718a7b9ba7a02f4429f01052246a1193a95bd56
parent 116096ff0949889044ec92acb089f8359de2dc3f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651859700 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651859700 +0000

[automerger skipped] Merge "Merge "Add timestamp attribute to source stamp block" into tm-dev am: 495c7bb224 am: 69598b6073" into tm-d1-dev-plus-aosp am: 116096ff09 -s ours

am skip reason: Merged-In I1ef084b04c8c252b3d9257e297196a55405549c8 with SHA-1 a1a82682ae is already in history

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

Change-Id: Ib33bbc7148af86b34b6f1cc80710284bf9d96de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>