| commit | 90324669f21e0676e66bc4ed681be560bba5f188 | [log] [tgz] |
|---|---|---|
| author | Dan Morrill <morrildl@google.com> | Wed Sep 01 17:03:33 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 01 17:03:33 2010 -0700 |
| tree | f39d27f158fc465d23a572ed71c801938122ae03 | |
| parent | b089a09764aebfdae824fd22ec77190c0ee62dcf [diff] | |
| parent | 61f1cbdd71942433ce1515b614ec3d9c259ea037 [diff] |
am 61f1cbdd: am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread Merge commit '61f1cbdd71942433ce1515b614ec3d9c259ea037' * commit '61f1cbdd71942433ce1515b614ec3d9c259ea037': Adding a feature definition corresponding to support for Near-Field