OSDN Git Service

Merge "Revert "Settings for NFC Unlock""
authorAndres Morales <anmorales@google.com>
Tue, 20 May 2014 23:40:26 +0000 (23:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 20 May 2014 23:40:30 +0000 (23:40 +0000)

Trivial merge