tree a36d485d7c8fbcc1c7ff3e04ba948d955c493e56
parent c45df0d7c1bcaaaa9fac1abc2f5ab059f57a20e8
author Mark Rathjen <mrathjen@google.com> 1484809421 -0800
committer Mark Rathjen <mrathjen@google.com> 1484809421 -0800

Fix NPE in SettingsProvider.

Bug: 34387347, 34396959, 34395671
Test: CTS tests passed, Manual testing passed
Change-Id: I333dfba05f9a4706af22b850b8a010cf391350fc