| commit | 472870ba15475fd5153130e45669b35bd8b71005 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 11:51:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:34 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 96be1844b925e164945caeddc6dace6842f20fe6 [diff] | |
| parent | 42c9d81e40d2fbc4d2f9037598cb018bd41a8405 [diff] |
am 841066e7: (-s ours) am 4036f5ab: am 4bf3dc93: Merge "Create Service and ServiceManager classes" * commit '841066e778c8e6d8c401b843d9df050b94b69bb4':