From: Prerepa Viswanadham <dham@google.com>
Date: Fri, 1 May 2015 17:57:25 +0000 (-0700)
Subject: Merge commit '5122502' into master_merge
X-Git-Tag: android-x86-6.0-r1~58
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f0254aa0;p=android-x86%2Fhardware-libhardware.git

Merge commit '5122502' into master_merge
---

f0254aa0a0bcdcf54084efb91a324b386006d575