| commit | 2de445cf70b8fa361d9e96cd46926d489156919f | [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 | 7845c43fd30484b450d101f924bc70d1b7f6c8f8 | |
| parent | ea5f5f9a868d9bc10ee252474485fa3399a76264 [diff] | |
| parent | a0410b4b6840c6227a448ef6a5df7b88cad3f863 [diff] |
am bd01583d: resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp Merge commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4' * commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4': move native services under services/