From: Pawin Vongmasa <pawin@google.com>
Date: Fri, 19 Aug 2016 16:57:05 +0000 (+0000)
Subject: Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d... 
X-Git-Tag: android-x86-7.1-r1~24^2~6^2^2^2^2^2^2^2^2~38
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c776d9b42f;p=android-x86%2Fframeworks-av.git

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev
am: 7a66bd2404

Change-Id: Ia6fabe0d3bcedf9834f3a7dfb8b2a6c19e4f0d80
---

c776d9b42ff411028f3dd7e93e0ba7b6578d735e