diff options
author | Josh Gao <jmgao@google.com> | 2016-09-28 14:01:44 -0700 |
---|---|---|
committer | Josh Gao <jmgao@google.com> | 2016-09-28 14:01:44 -0700 |
commit | 12258db6714b4951a3762746ccf9625f7d248730 (patch) | |
tree | 7fd98bbef60865af3a7cdb25fae18a99899133e9 /Android.mk | |
parent | 9512df2dcfb037b07c040420beff8fb220345bba (diff) | |
parent | 5fa6d3bb666ca035b627d028fbb4e0d9b8d18c6b (diff) | |
download | libusb-12258db6714b4951a3762746ccf9625f7d248730.tar.gz |
Merge remote-tracking branch 'aosp/upstream-master' into adb_libusb
Bug: http://b/31321337
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions