tree 1c4eefd648a29b7dfb117bb1dfd544845ec6104b
parent 3d03832b33419ff84fd40e9747ca610230db7420
parent 4b96eff41cb69579f5e4da861f3821f1fd3a8924
author Anatol Pomazau <anatol@google.com> 1287038044 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287038044 -0700

am 4b96eff4: am 22ba58cf: Merge "Add a util function that converts Text ndef record to text." into gingerbread

Merge commit '4b96eff41cb69579f5e4da861f3821f1fd3a8924'

* commit '4b96eff41cb69579f5e4da861f3821f1fd3a8924':
  Add a util function that converts Text ndef record to text.