diff options
author | Hansong Zhang <hsz@google.com> | 2018-11-20 18:23:10 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-11-20 18:23:10 -0800 |
commit | a7063f1830280e180a1fa0dff4bd7446d6a8f767 (patch) | |
tree | daade34f57d4e8290c541ce4590440f5df21529e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 56f272547fd45bbd5242adbb7b3d6a82e110bdc5 (diff) | |
parent | 652dffda0b813694ef803a7bd91b6247041c0240 (diff) |
Merge "BluetoothDevice.ACTION_UUID requires BLUETOOTH_ADMIN" am: 215a48cff4
am: 652dffda0b
Change-Id: I7ea71f54d211bf4656472b9a40cd6996507eaa18
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions