commit | 8bdbfa13b8feeab83d85211b8a4572fc71ed0645 | [log] [tgz] |
---|---|---|
author | Dan Morrill <morrildl@google.com> | Wed Sep 01 15:03:02 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 01 15:03:02 2010 -0700 |
tree | 9ed9102ca00cbd90b635642aaeef14510c72406a | |
parent | d937746ca52e85bfb7c4fe5befe4b80d22799d36 [diff] |
Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread