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