tree ae9343a803e3f0e6e4dc1b0ec792c956621c9f37
parent 2bd9f9777c80c98f43cd1c677687c835f6549240
parent 78a96339eef5009236a2f8db5f91f68ffce018bc
author Ruchi Kandoi <kandoiruchi@google.com> 1560400355 -0700
committer android-build-merger <android-build-merger@google.com> 1560400355 -0700

[automerger skipped] Merge "Update Secure NFC API definitions" am: 6b6b3322fc
am: 78a96339ee -s ours
am skip reason: change_id If78d90fdc0a24d5f44bbb582f388a9c60b12786c with SHA1 2d09e5c41f is in history

Change-Id: I728463737f50949e0eff1301aafb423daf912fc3