Mark Salyzyn 22221f6981 Merge "resolve merge conflicts of ec7e2a164c to master"

2017-01-12 17:23:01 +00:00

..

java

Merge "Introduce set/getFontVariationSettings."

2017-01-12 16:59:24 +00:00

jni

Merge "resolve merge conflicts of ec7e2a164c to master"

2017-01-12 17:23:01 +00:00

proto/android

Clean up file names for protos

2016-12-20 22:28:56 -08:00

res

Merge "Import translations. DO NOT MERGE"

2017-01-12 17:20:35 +00:00

tests

Merge "Add a required main category for multi logs."

2017-01-11 17:54:13 +00:00