Merge "Move NTP updates outside locks"
Import translations. DO NOT MERGE

Change-Id: Iceeb36fd0bb841e6bca65966a425a2de9d3c4121
Auto-generated-cl: translation import
am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev

* commit '47a8e863e32dc634aa1df79d805f4a366e13d4e9':
  Fix infinite recursive loop DO NOT MERGE
am 3b2b3aaf: am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev

* commit '3b2b3aaf9f37dd8e971f2846236dc551d5e38666':
  Fix infinite recursive loop DO NOT MERGE
am c88047bf: Merge "Move NTP updates outside locks"

* commit 'c88047bf86fd83e5b0204d26b35776cad97ed877':
  Move NTP updates outside locks
am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks"

* commit 'ae0edeb3e56c6aae113f8c5eaa3a03b79c00a93e':
  Move NTP updates outside locks
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
am 12e9bfd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '12e9bfd677895bee0d2b6f994e5f743d6df834fc':
  Import translations. DO NOT MERGE
am 18a4aa89: am c8d2abd8: Import translations. DO NOT MERGE

* commit '18a4aa8996891648bc0c9d7a5bed3b3bf28acdec':
  Import translations. DO NOT MERGE
am 346b6a42: am 18a4aa89: am c8d2abd8: Import translations. DO NOT MERGE

* commit '346b6a42217f43c563405f0112591de2ac8edb49':
  Import translations. DO NOT MERGE
am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '4df6c6292b9bfa35ece3c09d5094a7f4089c5029':
  Import translations. DO NOT MERGE
am 9e2783ee: am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '9e2783ee9feeefed644d5524d036ee4cbcb264f4':
  Import translations. DO NOT MERGE
am 09a526fa: Merge "Fix bug: swiped apps in Recents come back on rotate" into jb-mr1.1-dev

* commit '09a526faf311f77017f37af3fe8aba45bc2c32fb':
  Fix bug: swiped apps in Recents come back on rotate
am 712c2686: am 09a526fa: Merge "Fix bug: swiped apps in Recents come back on rotate" into jb-mr1.1-dev

* commit '712c26865c5d0491054143c15579c0c5db59923a':
  Fix bug: swiped apps in Recents come back on rotate
am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev

* commit 'f426ace9dab65c88b36a047bf921070edcf8cf61':
  Only wipe device if primary user (for failed password attempts)
am 1c2c48cb: am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev

* commit '1c2c48cba61e87f54f4b413b2192963dc71d76e3':
  Only wipe device if primary user (for failed password attempts)
am b544af37: am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev

* commit 'b544af3796b43afa9ae6f2196df569de175e0d24':
  Doc change: fix typo in jb docs.
am 3cc88345: am b544af37: am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev

* commit '3cc883459a29d73cc1401b72eecf1ab47a5397cc':
  Doc change: fix typo in jb docs.
am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev

* commit '9e98927e2dd3e9498753e6878709b2625e96feea':
  Retain configuration change info and sync access.
am 067a7ac4: am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev

* commit '067a7ac494c8a248840b9a7a46f22a0efff9e52f':
  Retain configuration change info and sync access.