| commit | f58a646bc01cc8d416d5babae2d06dad5018cc6d | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Wed Jan 07 16:26:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 16:26:19 2015 +0000 |
| tree | a4ac293d5193f44c857f3a4930d11d563371953e | |
| parent | 0347196c6992e490be74c2a4015bc6cd64504f15 [diff] | |
| parent | f11feccf99948d166e6873315252fdaf416ae272 [diff] |
am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev * commit 'f11feccf99948d166e6873315252fdaf416ae272': Don't display Write NFC option if no NFC