OSDN Git Service

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

* commit '1d5fbf66729b76485362beb26771592370bdef7b':
  Fix NPE in user settings.

Change-Id: I80b5e7c37b158ed03f43eeef78b4359ed107b730


Trivial merge