tree 9f2f7214f8dff174492de49112400e2d3a65ee4d
parent aef8af46316f4b397ee552562d9eae1e52e66963
parent 5aeb884114e79a3cf493c1e0cd3472983fa1e066
author Jack Yu <jackcwyu@google.com> 1553866048 -0700
committer android-build-merger <android-build-merger@google.com> 1553866048 -0700

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

Change-Id: I0ae1d6d17130897fb2f354022336280b5b44ddd8