Naomi Musgrave ff350a2f35 Merge "Include ID in toString of NetworkEvent subclasses, DNS and Connect event"

2018-01-16 15:00:38 +00:00

..

java

Merge "Include ID in toString of NetworkEvent subclasses, DNS and Connect event"

2018-01-16 15:00:38 +00:00

jni

Merge "Rename PremeasuredText to MeasuredText"

2018-01-16 00:47:52 +00:00

proto/android

Update comments and bump batterystats version to 30.

2018-01-11 16:36:06 -08:00

res

Merge "Remove saturation effect from screen-off anim"

2018-01-15 19:28:31 +00:00

tests

Merge "Rename PremeasuredText to MeasuredText"

2018-01-16 00:47:52 +00:00