OSDN Git Service

am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
authorMartijn Coenen <maco@google.com>
Thu, 29 Aug 2013 19:57:33 +0000 (12:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Aug 2013 19:57:33 +0000 (12:57 -0700)
commitff8ec5c56fd81f977c46a39badfd7de3bbfebfdd
tree62f89ba00083e66d90fbe7d061e326466b9506f5
parentd5d91948cd4bf6f8352f1ec24b51af7047b9661b
parentc9c5d57e4e900573b8f8b65af4215cb45b48ce93
am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev

* commit 'c9c5d57e4e900573b8f8b65af4215cb45b48ce93':
  Add requireDeviceUnlock attribute for NFC HCE.