From: Elliott Hughes <enh@google.com>
Date: Sun, 31 Aug 2014 05:30:48 +0000 (-0700)
Subject: resolved conflicts for merge of b2eb09a9 to lmp-dev-plus-aosp
X-Git-Tag: android-x86-6.0-r1~14^2~760
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1a96db3e;p=android-x86%2Fbionic.git

resolved conflicts for merge of b2eb09a9 to lmp-dev-plus-aosp

Change-Id: I0208958d78d6d7bc8c41568aa9abee15605b951e
---

1a96db3e8ea0b2a488a068c6f46f7e7ca2e5fc96