am 40e9ccaf: am 841066e7: (-s ours) am 4036f5ab: am 4bf3dc93: Merge "Create Service and ServiceManager classes"

* commit '40e9ccaf97bd6c6f03c08723edf5c9f982b82aec':
This commit is contained in:
Tom Cherry 2015-08-27 14:33:13 +00:00 committed by Android Git Automerger
commit d7bf6050f4

Diff content is not available