commit | eb2d14b81fc45df44e33af50d583f90b46a94a9a | [log] [tgz] |
---|---|---|
author | Ruchi Kandoi <kandoiruchi@google.com> | Fri Jan 06 22:42:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 22:42:28 2017 +0000 |
tree | b8f0d391597d636c27161e6496ee4face1a2997b | |
parent | 305e66ed3481ef861eb0d1142a977253613c4dda [diff] | |
parent | f30c2860d151a81072815452de6d5ef5c85ee58f [diff] |
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev am: cb4f643b95 am: f30c2860d1 Change-Id: Ie1eeb05332e670875704602c1a79ce17972a2e69