commit | bc1d78606c40470e6064a1323d64489535d5553b | [log] [tgz] |
---|---|---|
author | Ruchi Kandoi <kandoiruchi@google.com> | Fri Jan 06 19:19:51 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 06 19:19:51 2017 +0000 |
tree | e95cd713f2ed2c99d8cb9cdc48cea60bf9c0cbfa | |
parent | 92b504cb9e3feb94d1bcd7e987e0ba97ee5d0fc7 [diff] | |
parent | bbc00c877f61252eff29c7545c298811fc4f58db [diff] |
Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f am: c1db6c05d0 am: bbc00c877f Change-Id: I1a84b4ce4215136f30ce7936581ee80230c8abbc