From: Colin Cross <ccross@android.com>
Date: Wed, 30 Aug 2017 00:46:45 +0000 (+0000)
Subject: Merge "Fix errorprone build" am: 3abddeca75  -s ours
X-Git-Tag: android-x86-9.0-r1~394^2~5^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=88fa77b640;p=android-x86%2Fframeworks-base.git

Merge "Fix errorprone build" am: 3abddeca75  -s ours
am: 069915cd1c  -s ours

Change-Id: Ifb99a846c309f83f5d31cc81a88ca339787cf68b
---

88fa77b640daa9b40f30568d9ebb8fcccb4e5fc1