Merge "Merge "Fix NPE in user settings." into nyc-dev am: e69d754865
am: 9f6de156ca" into nyc-mr1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
82b2f3ece7