From: The Android Open Source Project Date: Tue, 21 Aug 2012 23:09:43 +0000 (-0700) Subject: am 49c88288: (-s ours) Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-4.4-r1~234 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0437a09471c7d3bc706d684219047a5df4a7adf7;p=android-x86%2Fhardware-libhardware.git am 49c88288: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '49c8828832705c7ab5462021201c81d59ce8f7e0': --- 0437a09471c7d3bc706d684219047a5df4a7adf7