tree 7590e563c79163264f15303b8ba32e0ab843ac1d
parent e1ea1e3e741a3ebafbf786fa1df07c0e0b9a51ae
parent d69b1cc4b13340ed188a17eaf60eb4083efe7ee5
author Jeff Hamilton <jham@android.com> 1295995315 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295995315 -0800

am f126ad3b: Merge "Use classnames instead of ints for NFC techs." into gingerbread

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