tree ae4fb028b5574ef5bc630dd70e1bb3d95ff921ad
parent 59d761f822c5ae4c2a268cea0ea9f1c38854b87c
parent 6c98d282de7604fcbdbc07be009d9e5a3a0d9f44
author Martijn Coenen <maco@google.com> 1453715612 +0000
committer android-build-merger <android-build-merger@google.com> 1453715612 +0000

Merge "Implementation of HCE for NFC-F." am: 695d489450
am: 6c98d282de

* commit '6c98d282de7604fcbdbc07be009d9e5a3a0d9f44':
  Implementation of HCE for NFC-F.