From: The Android Open Source Project Date: Thu, 20 Sep 2012 17:37:31 +0000 (-0700) Subject: Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-4.4-r1~69^2~42 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4d48e3e0;p=android-x86%2Fsystem-extras.git Reconcile with jb-mr1-release - do not merge Change-Id: Ic61db28563308c2da38d7b2c2c12e0486914ea17 --- 4d48e3e0543d99e53668a036d782a6fb42d2b6f6