commit | f30c2860d151a81072815452de6d5ef5c85ee58f | [log] [tgz] |
---|---|---|
author | Ruchi Kandoi <kandoiruchi@google.com> | Fri Jan 06 22:24:54 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 22:24:54 2017 +0000 |
tree | 96b3dcf3d57a4bd85316688e54e64f2c42334171 | |
parent | 8673349cc31f35d77bee19c8322dd905fa8f47b1 [diff] | |
parent | cb4f643b95e4562ce20211cb57e3302b5cf0990b [diff] |
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev am: cb4f643b95 Change-Id: I36d7312e2e9c6a121b3297c298d4e32867c7d84a