From: Nick Kralevich <nnk@google.com>
Date: Fri, 23 Oct 2015 21:59:06 +0000 (+0000)
Subject: DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c  -s ours am: dbc9a47831... 
X-Git-Tag: android-x86-7.1-r1~776
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3019fb875e6bf6e2eb7a4e94572a148ecedf6c7;p=android-x86%2Fframeworks-native.git

DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c  -s ours am: dbc9a47831  -s ours am: a2685ebb1e am: 1d94a1d036  -s ours am: bce101e79b am: 574145ea31 am: 5ce90247a2 am: fd84a642ff
am: 354393ef75  -s ours

* commit '354393ef75cdd25864f4d22ebba0c14163aedae4':
  DO NOT MERGE: fix build try #2
---

d3019fb875e6bf6e2eb7a4e94572a148ecedf6c7