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

* commit 'ca84938689028a7c5f5747d81b81cfc6a6c1b382':
am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9983e817b20980afd321739d80f99164a6b79bb0':
am 9942cb83: am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9942cb83c438238e5b486b20c07c166c727b00c6':
am be482d96: (-s ours) am 9942cb83: am 9983e817: am ca849386: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'be482d966527bf6894e23533afbe7d586c7f0f34':
Merge tag 'android-4.3.1_r1' into jb431

Android 4.3.1 Release 1

# gpg: Signature made Mon 07 Oct 2013 01:39:34 PM CDT using DSA key ID 9AB10E78
# gpg: Can't check signature: No public key