From: Jean-Baptiste Queru Date: Fri, 14 Jun 2013 05:33:07 +0000 (-0700) Subject: am 381868f3: (-s ours) am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours... X-Git-Tag: android-x86-4.4-r1~28^2~18^2^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eb82cca7f4b40bfb9aada2dfa56595d9e3ff1eda;p=android-x86%2Fdalvik.git am 381868f3: (-s ours) am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '381868f347d413a671a6ad9c0af64d258a060b99': --- eb82cca7f4b40bfb9aada2dfa56595d9e3ff1eda