am: cfdd9a90ff
* commit 'cfdd9a90ff0b98ef3948232c5db27cfeddd6e42a':
Fix NPE in user settings.
Change-Id: Id873584972e461677a088ff0e1327e887bba6879
am: cfdd9a90ff
* commit 'cfdd9a90ff0b98ef3948232c5db27cfeddd6e42a':
Fix NPE in user settings.
Change-Id: Id873584972e461677a088ff0e1327e887bba6879