tree 3209e7f20262fe63e85b9618ef622f11811c4b9e
parent 78dd885394447902cb80fe0b23dc3a7f0ae61fd8
parent 8c2ee34cadce04ca9cd36640038945d82223dacb
author Jordan Liu <jminjie@google.com> 1492453324 +0000
committer android-build-merger <android-build-merger@google.com> 1492453324 +0000

Merge "Add service-state content provider" am: c1d3c501c1
am: 8c2ee34cad

Change-Id: I7e2cb7db0a1ac084ed9d4b399459077099c3169a