commit | 457ce8f67224529a6f3524e8bbca2ecba3a80cc3 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 17 11:10:36 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 17 11:10:36 2010 -0700 |
tree | e5156d3567faae26d6fc69aa432953f08008db9d | |
parent | 5ca7509f5b188231666973a66566e6de2e3d48db [diff] | |
parent | 67672e04111a6cfdf572023a154675749c3fb550 [diff] |
am 67672e04: Merge a775965b from gingerbread Merge commit '67672e04111a6cfdf572023a154675749c3fb550' * commit '67672e04111a6cfdf572023a154675749c3fb550': Add AID_NFC for use by the NFC service.