OSDN Git Service

Merge "Update api for ServiceStateProvider" into oc-dev am: 728fbfb7c1
authorJordan Liu <jminjie@google.com>
Mon, 17 Apr 2017 21:59:10 +0000 (21:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 21:59:10 +0000 (21:59 +0000)
am: f63d979045  -s ours

Change-Id: Iffb58ee0b43552e8c60396872174377c2d1ed4f0


Trivial merge