Erik Kline 328a2f092d Merge "Fail if the interface is not available when starting" am: b331b02da9 am: a1f407d0f5 ...

am: f5af0cede5

Change-Id: Ief3c8e1652f69af0276fe35946ae1bf6e6b1b57e

2018-03-05 15:23:18 +00:00

..

java

Merge "Fail if the interface is not available when starting" am: b331b02da9 am: a1f407d0f5

2018-03-05 15:23:18 +00:00

jni

Merge "AID: Change loop to repeat and set from xml"

2018-03-05 01:23:19 +00:00

proto/android

Merge "Modifying proto csv output to include privacy levels."

2018-03-03 00:02:52 +00:00

res

Merge "Tag @SystemApi to ambient brightness stats API"

2018-03-05 14:50:07 +00:00

tests

Merge "Merge textclassifier/logging/ into textclassifier/"

2018-03-05 15:07:40 +00:00