am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp

Browse Source

* commit '95f7c8549928c0b383b3b3651224ded6b05a2f51':
  Use classnames instead of ints for NFC techs.

...

This commit is contained in:

Jeff Hamilton 2011-01-25 16:21:28 -08:00 committed by Android Git Automerger

parent 03016041d5 2dcaaf464b

commit faa9dce087

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available