Ruchi Kandoi bbc00c877f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f ...

am: c1db6c05d0

Change-Id: I874bc8b70d34ce2b579ff34eda0fd90c0284661d

2017-01-06 19:10:22 +00:00

..

java

Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." am: cc4203221b am: 388980d88f

2017-01-06 19:10:22 +00:00

jni

Merge "HwBinder: get/register checked exceptions." am: 9ec4fec5ca

2017-01-06 01:09:26 +00:00

res

bools: fix use_lock_pattern_drawable javadoc. am: c4046b5542

2017-01-06 17:48:37 +00:00

tests

Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am: 43c98c74fe am: ef5d1cb3b4

2017-01-06 09:50:07 +00:00