tree 432856f6a660189717670e9e150e6fb73ebe84a7
parent 3a249bb2e279efbd08b9119c5d965821e3e1c031
parent b8a82838dcb4cde55aae8b0bc9e0b77eb1ac3d4c
author Bruno Martins <bgcngm@gmail.com> 1704405842 +0000
committer Bruno Martins <bgcngm@gmail.com> 1704405842 +0000

Merge tag 'LA.QSSI.14.0.r1-11200-qssi.0' of https://git.codelinaro.org/clo/la/platform/vendor/codeaurora/telephony into lineage-21.0

"LA.QSSI.14.0.r1-11200-qssi.0"

* tag 'LA.QSSI.14.0.r1-11200-qssi.0' of https://git.codelinaro.org/clo/la/platform/vendor/codeaurora/telephony:
  Add support for CIWLAN data usage

 Conflicts:
	ims/ims-ext-common/src/org/codeaurora/ims/QtiVideoCallDataUsage.java

Change-Id: I9c066d1273a69c6191eef9fe38b287449ed59cea