tree 61710c7d76c84b707eef3eea7506c11924359bec
parent 086688af08e7f5665cc3e0893e785e4d7653827e
parent c1d3c501c1854025f7bce81dd9bc71e627cf00fa
author Jordan Liu <jminjie@google.com> 1492452792 +0000
committer android-build-merger <android-build-merger@google.com> 1492452792 +0000

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

Change-Id: I4f878abc7c36cd617aee63ca326b7d366143df38