am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '68719a176eacf86d19813a38f59041f3b209693d':
am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63c34b5e2aae446b76fdf34f0ff895e35cd7376a':
am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '800e4320ba0815bfe7831deab99f5d600800663f':
am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '840d233c12200de9260c85d6eadbc73b41cef00b':
am 381868f3: (-s ours) am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '381868f347d413a671a6ad9c0af64d258a060b99':
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/dalvik into cm-10.2

Android 4.3 Release 3.1
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2