| commit | fc5f01a88ae0e925eb65c840be21879bddc2e477 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 14:33:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:33:13 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | b7b230a5218d7cdf996203caba9f5cb635ef0fc8 [diff] | |
| parent | 472870ba15475fd5153130e45669b35bd8b71005 [diff] |
am 40e9ccaf: am 841066e7: (-s ours) am 4036f5ab: am 4bf3dc93: Merge "Create Service and ServiceManager classes" * commit '40e9ccaf97bd6c6f03c08723edf5c9f982b82aec':