OSDN Git Service

Merge "Fixes crash in security settings." into pi-dev
authorDoris Ling <dling@google.com>
Wed, 25 Apr 2018 17:05:18 +0000 (17:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 Apr 2018 17:05:18 +0000 (17:05 +0000)

Trivial merge