OSDN Git Service

Merge "Update api for ServiceStateProvider" am: 286b5f117d am: ea4a67ddd1 am: 56a13d1bce
authorJordan Liu <jminjie@google.com>
Mon, 17 Apr 2017 21:41:01 +0000 (21:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 21:41:01 +0000 (21:41 +0000)
am: e08f67f2ad  -s ours

Change-Id: Ia45e9c4a001f1de182e60970791919c1014431a2


Trivial merge