| commit | 2f1d7c3b8e944b3ccb121183bc7c055000d56fe1 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Oct 18 12:04:16 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 18 12:04:16 2010 -0700 |
| tree | 019ca26084abbcccb357df956b5df2b574c4e8e2 | |
| parent | c283c2e2c5ee492ce56aabb5d70a98bee403cf37 [diff] | |
| parent | 8a1c39374ca30e3aa8af6a96b81f2bddb3fb6ba2 [diff] |
am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp * commit '1f90908c19ab24791bd54c856b32bb12682496eb': Prevent use of NFC api if device is not featurized for NFC.