tree 760baff21ffe9596d2d94d43a304ba6f230e32db
parent 707a917c1d985afaa1dfeb9c6381888d1ab0cf8a
parent fa69bf7220461e519607c8ef00c80349c8b9a1c4
author Marco Miller <marco.miller@ericsson.com> 1582138746 -0500
committer Marco Miller <marco.miller@ericsson.com> 1582138758 -0500

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Make constants final

Change-Id: I4dd63e123cf895dbc28d1623a7272a004fd87579