From: Mike Lockwood Date: Thu, 4 Aug 2011 16:46:09 +0000 (-0700) Subject: Merge "Resolve merge conflict for '75f1fdec':" X-Git-Tag: android-x86-4.4-r1~5384 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7a4d2a6be7cbfa8a85e2953ca79339a79d646826;p=android-x86%2Fframeworks-native.git Merge "Resolve merge conflict for '75f1fdec':" --- 7a4d2a6be7cbfa8a85e2953ca79339a79d646826