| commit | 7247cfa9cd5cd740e98c88072969483df7b1e7dd | [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 | a39dc2975f1edc856c27d13ce1e6ea3ebac2f245 | |
| parent | 5ac4fe5113a1ece839560d0b57373755745a0c2f [diff] | |
| parent | 36e7790b6b3c2c36c67fbe5dc2e2313cdd537349 [diff] |
am 36e7790b: (-s ours) Merge a851d8d0 from gingerbread Merge commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349' * commit '36e7790b6b3c2c36c67fbe5dc2e2313cdd537349': NFC: Move NFC service implementation out of system_server.