tree b8f0d391597d636c27161e6496ee4face1a2997b
parent 305e66ed3481ef861eb0d1142a977253613c4dda
parent f30c2860d151a81072815452de6d5ef5c85ee58f
author Ruchi Kandoi <kandoiruchi@google.com> 1483742548 +0000
committer android-build-merger <android-build-merger@google.com> 1483742548 +0000

Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev am: cb4f643b95
am: f30c2860d1

Change-Id: Ie1eeb05332e670875704602c1a79ce17972a2e69