tree 5f8a775d9dfa7eeaf5d8c49567edb8771763722d
parent d8d51fed861cd36f57f1eb2542def23322379d7c
parent 99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2
author daniel_tomas <daniel.tomas@nxp.com> 1297878188 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297878188 -0800

am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation

* commit '99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
  New API added in NfcAdapter to enable/disable SE card emulation