TreeHugger Robot a2d6d3ccb5 Merge "resolve merge conflicts of 1095b21 to master"

2016-08-26 18:20:34 +00:00

..

java

Merge "resolve merge conflicts of 1095b21 to master"

2016-08-26 18:20:34 +00:00

jni

Merge "Adds framework support for hidl-gen Java backend. (to support structs)"

2016-08-25 22:23:02 +00:00

res

Merge "Various doc cleanups"

2016-08-26 17:37:09 +00:00

tests

Avoid JUnit4 collision in android-support-test, mockito-target

2016-08-25 19:37:46 +00:00