OSDN Git Service

[automerger skipped] Merge "Make setServiceId a TestApi" am: bd6bf7cbe8 am: d07eb64e0...
authorHall Liu <hallliu@google.com>
Thu, 12 Apr 2018 22:37:24 +0000 (15:37 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Apr 2018 22:37:24 +0000 (15:37 -0700)
am: c8d479f12e  -s ours

Change-Id: I3dea81b59a720fb21293c610ed40fbaf89145aea


Trivial merge