tree 2ab78e0ae0cda6d3ac8006cd6e0c6be8dc78a873
parent 47c78395d474197934b2ddd153373de96c434af9
parent 38650316142e98a5201723c04d517010d7911eef
author Andrew Vuong <akvuong@google.com> 1677279056 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1677279056 +0000

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

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

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