From: Xavier Ducrohet <xav@android.com>
Date: Wed, 27 Jul 2011 21:03:35 +0000 (-0700)
Subject: am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may... 
X-Git-Tag: android-x86-4.4-r1~3915^2~33
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fba44526c061882ac8c9d62e794e3102a20fc719;hp=-c;p=android-x86%2Fframeworks-native.git

am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"

* commit 'c682559d3c39aa4503d5c4d60ae046393aa45b79':
  DO NOT MERGE. may fix build on some version of gcc
---

fba44526c061882ac8c9d62e794e3102a20fc719