OSDN Git Service

Merge "Update ServiceState to adapt NetworkService change." am: 1168c31c4a am: bc1ea668f9
authorXiangyu/Malcolm Chen <refuhoo@google.com>
Wed, 7 Feb 2018 03:24:26 +0000 (03:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Feb 2018 03:24:26 +0000 (03:24 +0000)
am: ec00ab16ca  -s ours

Change-Id: I907d4ce3c94209cf421819a12ae8669ad196ef8f


Trivial merge