Wale Ogunwale 0cc85cd5f4 Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp ...

am: cd6eae6cce

Change-Id: Id6e530efea409379ac882843824baaf3260cb264

2018-03-24 04:54:12 +00:00

..

java

Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp

2018-03-24 04:54:12 +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