From: Bryan Mawhinney <bryanmawhinney@google.com>
Date: Fri, 24 Nov 2017 15:49:09 +0000 (+0000)
Subject: Merge "Make SettingsBackupTest pass again"
X-Git-Tag: android-x86-9.0-r1~316^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fff65245fab542ca9de2bf904743095fd0697d6a;p=android-x86%2Fframeworks-base.git

Merge "Make SettingsBackupTest pass again"
---

fff65245fab542ca9de2bf904743095fd0697d6a