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