summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <android-build-prod@system.gserviceaccount.com>2019-04-17 17:39:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-04-17 17:39:47 +0000
commit4122024e2c0044012753f5722e786a1c586a9fbc (patch)
tree073dff52504ce1ab545af53d2a4ccc4ca46410e2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb9cff90a0c8e5ef08e6332d7de5cfce9ad34f294 (diff)
parent11ab60599100bb70fc5817c3edcac1218aa05a38 (diff)
Merge changes from topic "am-099aba8d-4649-477a-a484-e163f97d6f95" into q-keystone-qcom-dev
* changes: [automerger] GAP: Turn on BT when both BLE APP and Settings trigger enable am: ed87040258 GAP: Turn on BT when both BLE APP and Settings trigger enable
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions