From: The Android Open Source Project Date: Thu, 11 Oct 2012 12:57:06 +0000 (-0700) Subject: Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-4.4-r1~662^2~71 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6;p=android-x86%2Fframeworks-av.git Reconcile with jb-mr1-release - do not merge Change-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81 --- 2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6