tree a1adc007f3fb619850ceec11ca6c753383e3d47c
parent 9745ec5421eb31fa5ee2e42da73037de14682bd6
parent 6827785e52495ca575d04e7a0ccb2f863c24dffc
author Ruchi Kandoi <kandoiruchi@google.com> 1546639102 -0800
committer android-build-merger <android-build-merger@google.com> 1546639102 -0800

Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
am: 6827785e52

Change-Id: I7c71bad831892bf9a853ca5d4777e42c1b3a9171