Paul Duffin ac4eac8970 Merge "Refactor code incompatible with Mockito 2.7.13" am: 2a3a4f81f9 ...

am: 17e5a2d851

Change-Id: I91f5108861ed4eb47d9fae13860e79babf0f4bf9

2017-03-10 20:47:09 +00:00

..

java

DO NOT MERGE Change permissions review mode check. am: 59bd89fa29

2017-03-09 15:52:17 +00:00

jni

Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into nyc-dev am: 69d20eab85 am: d098c42ebe am: a5affd0726 am: 236e162b3e

2017-03-10 00:31:12 +00:00

res

Merge "Add DUN to networkAttributes"

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

tests

Merge "Refactor code incompatible with Mockito 2.7.13"

2017-03-10 20:43:07 +00:00