| commit | f03c422652b5f69979a1319ae7d3af920b6341f3 | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Tue May 20 23:40:26 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 20 23:40:30 2014 +0000 |
| tree | 7f288e7bbb1497dbf42c27cd98a67a7cb40e0a69 | |
| parent | 7028d27a5634c78a78ae4c09004086e1799a80a2 [diff] | |
| parent | ad0c06aca383161a2d617a23c8d8cdb39ba15ead [diff] |
Merge "Revert "Settings for NFC Unlock""