tree 7caefd2e3eb1e9681abcc78800b38ee311335c32
parent 8262c7856ed7cd66cf96bb47abe1573086155d4c
parent 4c8fda62e1bf21318d22f4b85aaa1c729da976cf
author Nick Pelly <npelly@google.com> 1288023881 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288023881 -0700

am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread

Merge commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf'

* commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf':
  Fixed NdefTag parcelable conversion methods.