tree 98c2aa54138fd908e08466ccfb8567ddb09e10bf
parent 83c3741a90b79a43d864528607963c09364f4f86
parent 5be7524e145240058eff55e773dc71a7ab75a390
author Nick Pelly <npelly@google.com> 1285738818 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285738818 -0700

am 038cabe0: NFC integration

Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration