| commit | 52643b82b51db58a891aa043899b96afdb7a80a5 | [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 | a5b01e7714e08c28da6d945bea0296d013cbaccf | |
| parent | 21395d428b16e2388929dfeec0e8ebe57e0f0efb [diff] | |
| parent | fd1fc2949c044aff8f974b87c45968de5aa527a6 [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