TreeHugger Robot ed9ee58170 Merge "resolve merge conflicts of 1238daf to master"

2016-10-27 02:50:25 +00:00

..

java

Merge "resolve merge conflicts of 1238daf to master"

2016-10-27 02:50:25 +00:00

jni

Always call into native loader when load a native library am: 569834d861 am: 3512d092dd am: 35207ba655

2016-10-26 20:34:35 +00:00

res

resolve merge conflicts of ab00546 to stage-aosp-master am: bc2af49c21

2016-10-26 20:16:42 +00:00

tests

Make TextViewActivityTests MediumTests

2016-10-25 11:03:53 +01:00