tree 11ee4104e36c459bc9b5b9900fdb4bcdba4a0f74
parent 0ab09635d3e767132ba566dfe88e1dd8db9444b0
parent d311d05b113b4e258a01c77813faf3b8f4102573
author Jordan Liu <jminjie@google.com> 1492454645 +0000
committer android-build-merger <android-build-merger@google.com> 1492454645 +0000

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

Change-Id: I299abbaf1fa953745edca2655b9e8ffad55cd719