From: The Android Open Source Project Date: Mon, 8 Jul 2013 22:37:11 +0000 (-0700) Subject: am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge X-Git-Tag: android-x86-4.4-r1~301 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6760cfd1a6d3982664275ae02835a3dd72b30cac;p=android-x86%2Fframeworks-av.git am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '291967728b02ad9a7d5545b0eb1ec0c4c3d664af': --- 6760cfd1a6d3982664275ae02835a3dd72b30cac