From: The Android Open Source Project Date: Mon, 6 Aug 2012 20:34:52 +0000 (-0700) Subject: Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-4.4-r1~422^2~284 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=95bd5ab91211e208b1080b3fa0696b75838d7b4f;p=android-x86%2Fframeworks-native.git Reconcile with jb-mr1-release - do not merge Change-Id: I4761d711f0886ee4e81496a0068e35bcb91bf8b3 --- 95bd5ab91211e208b1080b3fa0696b75838d7b4f