| commit | 058f00350766a19b06bfdc72850985c3eca71c5f | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Fri Aug 24 07:29:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 24 07:29:52 2012 -0700 |
| tree | 0013a04e97baa40e711180b60d58ba553cb886c4 | |
| parent | 07bde72ff9209de9c037d9bba36bdf0cba299aab [diff] | |
| parent | 2a4aaf133c8bec9bbfcd50c1eb0f25896f579cd1 [diff] |
am 2a4aaf13: Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp * commit '2a4aaf133c8bec9bbfcd50c1eb0f25896f579cd1': Fix system server restart