tree 40eb3aa0a462e0dbf31fa648e6ee5cbae27edecf
parent 45278444bfbc89bc5ae84fe7dc169ebf7073a72e
parent 162a6fad72245ab668fb1956981049d4c8da1658
author Mark Lu <marklu@google.com> 1468268431 +0000
committer android-build-merger <android-build-merger@google.com> 1468268431 +0000

Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
am: 162a6fad72

Change-Id: If11947a089756b7ca72f6a579d4b1cbe54535185