Alice Sheng 6036a2b5bf Merge "Add setting for disabling swap." into pi-dev ...

am: 7384995cf8

Change-Id: I2a8207237a5cf2e0b2d1be0996aece7542d9b90d

2018-03-23 19:47:06 +00:00

..

java

Merge "Add setting for disabling swap." into pi-dev

2018-03-23 19:47:06 +00:00

jni

Merge "detect api version, and start respecting offsets" into pi-dev

2018-03-23 11:25:19 +00:00

proto

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

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

res

Merge "Add multisim notifications for SST" into pi-dev

2018-03-23 09:42:40 +00:00

tests

Merge "Add setting for disabling swap." into pi-dev

2018-03-23 19:47:06 +00:00