Ruchi Kandoi 999b6bc2a7 Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52 am: 67d3257519 ...

am: a404bfb348

Change-Id: I300bc7d72f21dc42692f69fc32697d484ed3b4f5

2017-07-06 23:15:42 +00:00

..

java

Merge changes from topic 'NCI-2.0' am: 430dded515 am: 4d08be4a52 am: 67d3257519

2017-07-06 23:15:42 +00:00

jni

Merge "Fix NPE in BitmapFactory when an allocation of hw bitmap failed"

2017-07-06 22:38:49 +00:00

proto/android

…

res

NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11 am: 93d313b0a0 am: a161427214

2017-07-06 23:14:42 +00:00

tests

Merge "Add a Setting for whether or not we have been disabled by policy." into oc-dr1-dev

2017-07-06 22:03:36 +00:00