Diff - refs/heads/android14-d2-s5-release^1..refs/heads/android14-d2-s5-release - platform/external/apache-velocity-engine

commit: 1ac9c00f57d8c50fe13d455334ed3f1ac3475f63
[log]
author: Andrew Vuong <[email protected]>
Fri Feb 24 21:59:21 2023 +0000
committer: Automerger Merge Worker <[email protected]>
Fri Feb 24 21:59:21 2023 +0000
tree: 2ab78e0ae0cda6d3ac8006cd6e0c6be8dc78a873
parent: 3a93ff26417a5ade1de3c4a642cb70cb7a2d3fc0 [diff]
parent: dbb091f02e9fdafad30f2f80e54f4efdf86e15a8 [diff]

[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 <[email protected]>