OSDN Git Service

Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId"...
authorEugene Susla <eugenesusla@google.com>
Mon, 10 Apr 2017 15:18:14 +0000 (15:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Apr 2017 15:18:14 +0000 (15:18 +0000)
am: 0ac8fd7adb

Change-Id: Icb3fa2e51547fc50cc161052ca83050b5539a1f9


Trivial merge