| commit | c91676e6d96e1edf104cc5be42497393aa71ce6e | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Tue Feb 03 16:04:37 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 03 16:04:37 2015 +0000 |
| tree | 0056c40f8d252bec70b588b17570ecb26df78675 | |
| parent | 7221a6bcaaf1add38e8eb44e35c7f5f9f4de33f0 [diff] | |
| parent | 4bd31b9ac676a5d3c6943bc9f86f524eedad5bef [diff] |
am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter automerge: 98d8a49 automerge: 4bd31b9 * commit '4bd31b9ac676a5d3c6943bc9f86f524eedad5bef': Use getDefaultAdapter instead of getNfcAdapter