From: Colin Cross <ccross@android.com>
Date: Thu, 31 Aug 2017 22:43:03 +0000 (+0000)
Subject: Merge "Fix errorprone build" am: 0bed3cacd7  -s ours am: a1bcb02184  -s ours am:... 
X-Git-Tag: android-x86-9.0-r1~206^2~8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c19d2bccbf94e2209fc835082b72304a7be6f645;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix errorprone build" am: 0bed3cacd7  -s ours am: a1bcb02184  -s ours am: 450f423a21  -s ours
am: bfab966085  -s ours

Change-Id: I53491f4186ffcdd48c6dc0184018fc982a75d549
---

c19d2bccbf94e2209fc835082b72304a7be6f645