From: Dianne Hackborn Date: Thu, 2 Jun 2011 17:17:05 +0000 (-0700) Subject: Merge "resolved conflicts for merge of 76450622 to master" X-Git-Tag: android-x86-4.4-r1~7020 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=74798f1d3daab6f0055cb46fcf5d3d14b7b17c4a;p=android-x86%2Fframeworks-native.git Merge "resolved conflicts for merge of 76450622 to master" --- 74798f1d3daab6f0055cb46fcf5d3d14b7b17c4a