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

* commit '32c3e9652335f55624d0c28226f6b7403468223b':
am 03b1a002: (-s ours) am 32c3e965: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '03b1a0028d608305cce6c832fc3a4b98b45eaec5':
am b1ceaa32: am 03b1a002: (-s ours) am 32c3e965: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b1ceaa328c59b6ff8ab963212586d6b6fdf9dfe9':
am f644f7d6: am b1ceaa32: am 03b1a002: (-s ours) am 32c3e965: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f644f7d6348edf1327d3a792c66e9446ed143511':
Merge tag android-4.3.1_r1 into dev-mips-jb-mr2