OSDN Git Service

am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp...
authorJeff Hamilton <jham@android.com>
Wed, 26 Jan 2011 00:21:28 +0000 (16:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jan 2011 00:21:28 +0000 (16:21 -0800)
commitfaa9dce08742ff653ed86e25485a6fed29348b59
treeacba5f60cce6a25d14338f5b7103821f592d65ab
parent03016041d514258ff69361ec1c1ce0249b4ba373
parent2dcaaf464b86932e972aacd67bb72a3d7da6c253
am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp

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