From: Colin Cross <ccross@android.com>
Date: Mon, 3 Oct 2016 20:32:01 +0000 (+0000)
Subject: Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b4... 
X-Git-Tag: android-x86-8.1-r1~2121^2~2540
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9b5b70114;p=android-x86%2Fframeworks-base.git

Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935
am: 95311818f0

Change-Id: I45b57d37d08699afc070699d07485cb83c51850a
---

e9b5b7011442a20728c64704a6f35c2ddc3420c5