Hyunyoung Song 4f8f072f7c Merge "Add launcher.proto to atoms.proto"

2018-10-26 04:57:58 +00:00

..

java

Merge "Color aspects keys information stored database" am: e4c918ba8e am: 89c615866a

2018-10-25 21:36:59 -07:00

jni

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

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

proto

Add launcher.proto to atoms.proto

2018-10-25 15:22:12 -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