OSDN Git Service

Merge "Make setServiceId a TestApi" into pi-dev
authorHall Liu <hallliu@google.com>
Wed, 11 Apr 2018 20:30:18 +0000 (13:30 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Apr 2018 20:30:18 +0000 (13:30 -0700)
am: d41e669fca

Change-Id: I0ca985c9741b3f710c636595b7eb9b2b326e67fb


Trivial merge