Chalard Jean 96d551145d Merge "To support skip464xlat per Network" am: a01c77a499 am: e826aa52e4 ...

am: fbb737678b

Change-Id: I4a6d7480e2e7e775e511cc7eaaabe65b6a3bde7d

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

..

java

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

2018-10-25 20:09:15 -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