tree 578cdf1584a63314502b63ca0cb19e78cf2539ba
parent 7960b7fe368343e96e4a788a4df0271cb4dd3cab
parent 5811bbb366f2584c84dcac33dd31923d166c13bb
author William Escande <wescande@google.com> 1696970672 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1696970672 +0000

Merge changes from topics "apk_in_apex-burndown", "apk_in_apex-burndown-fwk-bluetooth" into main

* changes:
  Fix Bluetooth app dependency
  Jarjar to prevent conflict w fwk-bluetooth.jar
  Jarjar to prevent conflict w system/framework.jar