From: Pawin Vongmasa <pawin@google.com>
Date: Fri, 19 Aug 2016 18:01:11 +0000 (+0000)
Subject: DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e... 
X-Git-Tag: android-x86-7.1-r1~24^2~8^2~16^2~9^2~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ab3d5af8d26b55e5fc34092265d4ba28e8652eb7;p=android-x86%2Fframeworks-av.git

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff  -s ours am: 83cf293b73  -s ours am: 45cd2f896b am: 52f7319fc0 am: ab5c805aec  -s ours am: 1dd4973234 am: 484d229a3c
am: 2c4162e822

Change-Id: I3baeab891856725b93c22c11ea0a0b6f4bc8ddbb
---

ab3d5af8d26b55e5fc34092265d4ba28e8652eb7