| commit | bbc00c877f61252eff29c7545c298811fc4f58db | [log] [tgz] |
|---|---|---|
| author | Ruchi Kandoi <kandoiruchi@google.com> | Fri Jan 06 19:10:22 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 19:10:22 2017 +0000 |
| tree | cef27c9116236073cb115e42703f922b66b195e0 | |
| parent | 66602c88854b03d46079814c64742c3513b21ce4 [diff] | |
| parent | c1db6c05d03cb6e6b81bb23cc7869b4034df6883 [diff] |
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f am: c1db6c05d0 Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d