tree 0221ae7c7a22dc0991e138158dacd920ee3b3817
parent 926ad822f610a074f49589f6884a0dd34dbe2123
parent 8e02602012f9aa2db5b4e6363a3bbbbd26feceec
author Jack Yu <jackcwyu@google.com> 1553866640 -0700
committer android-build-merger <android-build-merger@google.com> 1553866640 -0700

Merge "Add Nfc Offhost SecureElements feature definition" am: 041c8ab48f am: 5aeb884114
am: 8e02602012

Change-Id: I05b7f78b9ecf099804352f3acf1ef78ac7c4d201