OSDN Git Service

Merge "Fix NPE in user settings." into nyc-dev
authorJulia Reynolds <juliacr@google.com>
Fri, 29 Apr 2016 14:34:28 +0000 (14:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 14:34:28 +0000 (14:34 +0000)
am: e69d754865

* commit 'e69d754865572edf40a59c0edbf657a0d7948865':
  Fix NPE in user settings.

Change-Id: Icb2585bb7619e9bac4592f904b8978b8668ba4ff


Trivial merge