Robert Berry 175f666461 Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev ...

am: 73b7722c13

Change-Id: I33b404ffc1e4554c3f3f76a4cd92d10fe4923761

2018-03-23 21:31:58 +00:00

..

java

Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev

2018-03-23 21:31:58 +00:00

jni

Merge "Add isPivotSet/resetPivot" into pi-dev

2018-03-23 19:26:50 +00:00

proto

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

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

res

Merge "Provide app launch count in UsageStats" into pi-dev

2018-03-23 20:49:16 +00:00

tests

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

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