Erik Kline 17d4e7fa69 Merge "Merge "Pass all relevant resolver info to netd" am: 76f64641bb am: 3ce3bc4582" into pi-dev-plus-aosp ...

am: 361e903c66

Change-Id: Ia4d896c4cc33c02f0c46d5d4c760cc33b13dff0b

2018-03-24 04:29:06 +00:00

..

java

Merge "Merge "Pass all relevant resolver info to netd" am: 76f64641bb am: 3ce3bc4582" into pi-dev-plus-aosp

2018-03-24 04:29:06 +00:00

jni

Merge "Use ABI_STRING." am: ca7ce49ecc am: da01ce155f

2018-03-23 22:48:35 +00:00

proto

Add new key from Settings.java to settings.proto.

2018-03-23 11:15:37 +00:00

res

Merge "Fix AOD styling when pulsing" into pi-dev am: 8d114ef8ae

2018-03-24 02:03:30 +00:00

tests

Merge "Add setting for disabling swap." into pi-dev am: 7384995cf8

2018-03-23 20:08:08 +00:00