OSDN Git Service

Merge "Fix crashes in Settings" into mnc-dr-dev
authorJason Monk <jmonk@google.com>
Fri, 16 Oct 2015 16:33:56 +0000 (16:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 16 Oct 2015 16:33:56 +0000 (16:33 +0000)

Trivial merge