Abodunrinwa Toki 018168b41f Merge "Merge textclassifier/logging/ into textclassifier/" into pi-dev ...

am: 9554dd94ec

Change-Id: Ic4f3b315e6afb94cdeea6b057af2fc84379f2b07

2018-03-12 15:49:43 +00:00

..

java

Merge "Merge textclassifier/logging/ into textclassifier/" into pi-dev

2018-03-12 15:49:43 +00:00

jni

Merge "Zygote: Set libbase default tag on fork" into pi-dev

2018-03-10 03:09:52 +00:00

proto

Merge "Removing EXPLICT tag from Batterystats metric names." into pi-dev

2018-03-09 21:17:36 +00:00

res

Merge "[Magnifier-28] Set corner radius" into pi-dev

2018-03-12 14:29:23 +00:00

tests

Merge textclassifier/logging/ into textclassifier/

2018-03-10 13:13:14 +00:00