OSDN Git Service

Merge "Don't crash in SecondaryUserController." into oc-dev
authorDaniel Nishi <dhnishi@google.com>
Wed, 12 Apr 2017 18:57:47 +0000 (18:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 12 Apr 2017 18:57:48 +0000 (18:57 +0000)

Trivial merge