From: Robert Greenwalt Date: Sat, 29 Jan 2011 17:32:04 +0000 (-0800) Subject: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp X-Git-Tag: android-x86-4.4-r1~8504^2~389 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e0b71f14462a024714d3ffe339acb2dc1f8efd86;p=android-x86%2Fframeworks-native.git resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963 --- e0b71f14462a024714d3ffe339acb2dc1f8efd86