| commit | e42ec2c0ef65e5f078f75de8db9ee13f9b657568 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 17 13:49:03 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 17 13:49:03 2010 -0700 |
| tree | 60e01d1b54244b5da6a07286d5794b6fb7346442 | |
| parent | 30fbcf66fcf98c2d9aacd0dcf0a6d79922aed390 [diff] | |
| parent | f4b45fecb44ffa6a1ce4c1f41a1f998af5bdba78 [diff] |
am 36e7790b: (-s ours) Merge a851d8d0 from gingerbread Merge commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349' * commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349': NFC: Move NFC service implementation out of system_server.