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)
commit035b4827ca8aad5126ef50dc066f92e33047a229
tree22335452b117c7ac59b7b5b1b26a657953d72f04
parent64ab0490c0c306b7c3d80abeefcf4c641bc1b33e
parentd41e669fca06ad53e1407a439a1c391fcfb7ab29
Merge "Make setServiceId a TestApi" into pi-dev
am: d41e669fca

Change-Id: I0ca985c9741b3f710c636595b7eb9b2b326e67fb