diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-11-09 23:39:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-11-09 23:39:29 +0000 |
| commit | b074a9230361c5cf53fef0e056ac31672900f894 (patch) | |
| tree | 6ba75b2246e21cd861ac6ca8e615bd69a5d376c3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 78c059ffe28ad6e0b23471ffa7e77fc2b444f191 (diff) | |
| parent | c411b3d46b95adb2c4e376302f50fa5e76e4d761 (diff) | |
Merge changes from topic "am-7fec959a40764617b57e2cea2d11e35d"
* changes:
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067c2 am: 64a1fbb8cf am: 874ab0ef21
Add IBluetoothSocketManager (3/3) am: 422af4d049 am: 6e78c792b1 am: 4a734916f1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions