| commit | 33b8084320550bdfe6216a0f3af72332f9a6dab7 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Thu Dec 05 22:37:46 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:37:46 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 153dbe90bf9a2e5a9f8b8957ceea4e59d29ca69b [diff] | |
| parent | b35872f3a7622b168896c564136bf9e59ac9e96b [diff] |
am b35872f3: (-s ours) am 38cfa935: am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host." * commit 'b35872f3a7622b168896c564136bf9e59ac9e96b':