am db4cfb0c: (-s ours) am 9598002a: am 2a1ccab1: Import translations. DO NOT MERGE

* commit 'db4cfb0c85c19451fbf1a07acc629e4caea36120':
  Import translations. DO NOT MERGE
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Merge "Import translations. DO NOT MERGE"
am 5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

* commit '5ecc395ef2c96f899b396e937be97cc597775d8a':
  Import translations. DO NOT MERGE
am 9d41a551: (-s ours) am 5ecc395e: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

* commit '9d41a551e5ceb23afb21db818626a5b377f410a9':
  Import translations. DO NOT MERGE
Merge "VZW wants the phoneNumber to be 10 zero's if there isn't one." into jb-mr2-dev
am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev

* commit '80bfbd53151eccb8888aafc81d3dccea87cdca29':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev

* commit '95c2a4a43039705f573b346026908369aa5df2b6':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
am eeb90735: am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev

* commit 'eeb90735dd7accfa34d77bcc8023412dab84bf9d':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
merge in klp-release history after reset to master
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe
am f2d9e68c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'f2d9e68c238d754d00fa846b4d4c6737a24595fc':
Import translations. DO NOT MERGE

Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I5ed3429648c82e9a2cf4ca62f308639371bcfdde
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: Iea816bd3e1110127bc01ea2beacc0071ed42ed24
Auto-generated-cl: translation import
Potential fix for Settings instability on x-large.

Bug: 9752185
Change-Id: I1b2af6661a601e1d487a35a53f5d01e58529a34d
Merge "Potential fix for Settings instability on x-large."
Potential fix for Settings instability on x-large.

Bug: 9752185
Change-Id: I1b2af6661a601e1d487a35a53f5d01e58529a34d
Merge "Import translations. DO NOT MERGE"