tree 9f2f7214f8dff174492de49112400e2d3a65ee4d
parent 401b546810cbaa752f7410fa7fad09b1282fcebb
parent 041c8ab48f062beddcee7fa3ccea6e0ad88cf0e2
author Jack Yu <jackcwyu@google.com> 1553865469 -0700
committer android-build-merger <android-build-merger@google.com> 1553865469 -0700

Merge "Add Nfc Offhost SecureElements feature definition"
am: 041c8ab48f

Change-Id: Ia96650c75cf0e24aa5f9448940298f0b77767b0b