Ruchi Kandoi 9377a53aa9 Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field" ...

am: 7b0d16249c

Change-Id: I35ccc367fc1182c1cf8c470d8bfcf6dcf27d2825

2017-03-07 02:46:54 +00:00

..

java

Merge "nfc: First chunked NDEF record of TNF doesn't contain the type field"

2017-03-07 02:46:54 +00:00

jni

Merge "Make seccomp honor setenforce"

2017-03-04 02:17:43 +00:00

res

Merge "Add DUN to networkAttributes"

2017-03-01 19:35:52 +00:00

tests

Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2

2017-02-17 22:25:53 +00:00