| commit | 7b5b20ef678a7b07946f85370f9654ca7ff11c01 | [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 | 16752f12b55255830f303dec7fd711a318e4950f | |
| parent | 92fba4bc019903f3f37905a0270441e88ccf23a9 [diff] | |
| parent | bd01583d6e936e93141d6b77aec9d8c99684d7a4 [diff] |
am bd01583d: resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp Merge commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4' * commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4': move native services under services/