OSDN Git Service

Merge "Make SettingsBackupTest pass again"
authorBryan Mawhinney <bryanmawhinney@google.com>
Fri, 24 Nov 2017 15:49:09 +0000 (15:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 24 Nov 2017 15:49:09 +0000 (15:49 +0000)

Trivial merge