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)
commit2cfa2e1c4054cb8e9fae7fffc4a9470d098634ff
tree459861cc79c8183c16f34a33b84235678d4f32c4
parente5f2ef1d20da2796be4fe53841a7cc7b202fc868
parentc8d479f12ec0f4b0c1b719bf6907f06b05627943
[automerger skipped] Merge "Make setServiceId a TestApi" am: bd6bf7cbe8 am: d07eb64e09  -s ours
am: c8d479f12e  -s ours

Change-Id: I3dea81b59a720fb21293c610ed40fbaf89145aea