| commit | 29a322f63759edab81c50630d9f20769a06c827e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 26 10:26:46 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 26 10:26:46 2010 -0700 |
| tree | 85de1c7d72ef9e64215bb43a043984b02765fdb9 | |
| parent | 6a970b49033688f0422fc613568d30148b6b301a [diff] | |
| parent | 9cde3ce3bd58a3276a927c11ece3e3d27db74a9b [diff] |
am bd01583d: resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp Merge commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4' * commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4': move native services under services/