Erik Kline d3f4a27c59 Merge changes Icd3d09aa,I4b070964 ...

am: a0661c4fdf

Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642

2017-09-14 08:14:09 +00:00

..

assets

Use SettingsLib's versions of Custom* classes.

2017-06-21 14:47:37 -07:00

res

Update buttons in FP find sensor

2017-06-23 18:05:20 -07:00

src

Merge changes Icd3d09aa,I4b070964

2017-09-14 08:14:09 +00:00

Android.mk

Migrate settings robolectric tests to mockito 2

2017-05-24 15:14:31 -07:00