tree 2ab78e0ae0cda6d3ac8006cd6e0c6be8dc78a873
parent 3a93ff26417a5ade1de3c4a642cb70cb7a2d3fc0
parent dbb091f02e9fdafad30f2f80e54f4efdf86e15a8
author Andrew Vuong <akvuong@google.com> 1677275961 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1677275961 +0000

[automerge] Merge of apache-velocity-engine from aosp/master 2p: 757677e884 am: dbb091f02e

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-velocity-engine/+/21545885

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