commit | c6d6f55ec4850642bb80d42a4f7165ff07d2a0fe | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Mar 20 17:23:59 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 20 17:23:59 2018 +0000 |
tree | 4ba3327b19ae7dc84ca3ddb23ec680342d4859eb | |
parent | 7a4a3599128478fa930b0a623130157a4def9412 [diff] | |
parent | 14a8b1e318073b1608499195477b51b4723e74e6 [diff] |
Merge "NfcAdapter.EXTRA_SE_NAME -> NfcAdapter.EXTRA_SECURE_ELEMENT_NAME" into pi-dev