Chong Zhang d31872bc6a Merge "Color aspects keys information stored database" am: e4c918ba8e am: 89c615866a ...

am: e8c39f3ba0

Change-Id: I08c65f1b032fe92994202b64900cccc4f61adaef

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

..

java

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

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

jni

Merge "Offload support for android.media.AudioTrack"

2018-10-25 14:21:40 +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