OSDN Git Service

[automerger skipped] Merge "Make setServiceId a TestApi" am: bd6bf7cbe8
authorHall Liu <hallliu@google.com>
Thu, 12 Apr 2018 22:18:07 +0000 (15:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Apr 2018 22:18:07 +0000 (15:18 -0700)
commitc8d479f12ec0f4b0c1b719bf6907f06b05627943
treee8a2409ed16db997ed3f415cd5430bf5bb2123b1
parente467e30cd07fab71cef6031aab80526b2cd2b2e0
parentd07eb64e090b21658933ed9e619fc6967f697bc8
[automerger skipped] Merge "Make setServiceId a TestApi" am: bd6bf7cbe8
am: d07eb64e09  -s ours

Change-Id: I47993c2fe5d68e7fa4aec5f2f15c987e99baf543