Kweku Adams 43f73b2e40 Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev am: cff4c5492e ...

am: 635c42becc

Change-Id: I24513755644e10adb62dda85892570df1b2be6e9

2018-03-26 20:37:07 +00:00

..

java

Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev am: e1c76d71e7

2018-03-26 17:15:11 +00:00

jni

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

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

proto

Refactoring GlobalSettingsProto to avoid method limit.

2018-03-23 18:03:43 -07:00

res

Merge "Add UX string tweaks before string freeze." into pi-dev am: 4b46d3e1e4

2018-03-25 22:31:40 +00:00

tests

Merge "Add tests for VibrationEffect"

2018-03-26 13:56:57 +00:00