From: The Android Open Source Project Date: Fri, 21 Jun 2013 18:58:20 +0000 (-0700) Subject: am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge X-Git-Tag: android-x86-4.4-r1~325 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a2cf13c77260f98fc674f103dcbd2bb2488a80ce;p=android-x86%2Fframeworks-av.git am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd': --- a2cf13c77260f98fc674f103dcbd2bb2488a80ce