tree adb64c650885008a1b21eaedbeb3b9fc778f44aa
parent 153dbe90bf9a2e5a9f8b8957ceea4e59d29ca69b
parent b35872f3a7622b168896c564136bf9e59ac9e96b
author Martijn Coenen <maco@google.com> 1386283066 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386283066 +0000

am b35872f3: (-s ours) am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host."

* commit 'b35872f3a7622b168896c564136bf9e59ac9e96b':