OSDN Git Service

Merge "Fix NPE in SettingsProvider."
authorMark Rathjen <mrathjen@google.com>
Thu, 19 Jan 2017 20:12:20 +0000 (20:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 19 Jan 2017 20:12:24 +0000 (20:12 +0000)

Trivial merge