tree 2ab78e0ae0cda6d3ac8006cd6e0c6be8dc78a873
parent 399e01dd9f03d68e94e7e1fe2f4107352bc4a37e
parent 1ac9c00f57d8c50fe13d455334ed3f1ac3475f63
author Andrew Vuong <akvuong@google.com> 1677279100 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1677279100 +0000

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

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

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