tree bce19678e97723c6004eb119f8b367c6aaca63d0
parent cf9d87c68874e6008399fa1f571dbff34cf3fc82
parent a7397883de67d674970d91f86d46ccf637e5e543
author Martijn Coenen <maco@google.com> 1375490942 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1375490943 +0000

Merge "NFC: Host-based card emulation APIs."