TreeHugger Robot 3fb3ac1ab2 Merge "Keep file path used to create SkTypeface in MinikinFontSkia"

2018-10-26 04:12:51 +00:00

..

java

Merge "To support skip464xlat per Network" am: a01c77a499 am: e826aa52e4

2018-10-25 20:09:15 -07:00

jni

Merge "Keep file path used to create SkTypeface in MinikinFontSkia"

2018-10-26 04:12:51 +00:00

proto

Move Settings atom enums to its own file.

2018-10-23 13:04:07 -07:00

res

Merge "Import translations. DO NOT MERGE"

2018-10-26 02:44:52 +00:00

tests

Merge "pm: Disallow HIDL libs from boot jars >= Q." am: 06182b0764 am: 7430f3e6fd

2018-10-25 16:51:48 -07:00