tree 1e8edba0cb42f1b724126a93edf8b7ebb5769e07
parent 928cf290c8fabf4fba347c6c142bb190452502d6
parent 6b1eef234d3c00abde23aaa2ec8059890f30ffa8
author David Duarte <licorne@google.com> 1700006663 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1700006663 +0000

Merge changes Ic371d463,Ie4d962c2,I1ecd62fb,Ica3a56cf,Iff00766a into main

* changes:
  TEST_MAPPING: Remove internal keyword
  TEST_MAPPING: Align with internal branch
  Revert "RESTRICT AUTOMERGE Disable GoogleBluetoothInstrumentation test"
  Revert "RESTRICT AUTOMERGE Disable FrameworkBluetoothTests test"
  Revert "RESTRICT AUTOMERGE Disable ServiceBluetoothTest test"