OSDN Git Service

Merge "Allow restore of settings with nullable components" into pi-dev
authorAnnie Meng <anniemeng@google.com>
Tue, 22 May 2018 18:38:19 +0000 (18:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 22 May 2018 18:38:19 +0000 (18:38 +0000)

Trivial merge