summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-22 21:35:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-22 21:35:27 +0000
commit8371addcb473b4259366ea6c349e68113528b215 (patch)
treeccf09472ec3f1608c1f9cee4cde4940f06b50d6b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3ee27a2d7ba6e6e8f4be1cd6e02cdc5268147d11 (diff)
parent5a607f26660822130ab94bc3680924769caa56da (diff)
Merge "Add error log to BluetoothAdapter.factoryReset() and make BluetoothAdapter.getUuids() marked with @Nullable" am: b4dbfff366 am: 5a607f2666
Change-Id: Icde5c7bccb2e7f4f5a8ae9e44d8a44dcce0234f7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions