merge in master-release history after reset to master
am 61c30fe2: Merge "Fix monkey crash" into jb-mr2-dev

* commit '61c30fe2d14573378321d3a8df21ffb14a54e43b':
  Fix monkey crash
am 86ecd3c4: Merge "Device Admin Settings changes for Device Owner" into jb-mr2-dev

* commit '86ecd3c437be3478ee17347df46ae53af0eef5ba':
  Device Admin Settings changes for Device Owner
am 05d67f62: Merge "Allow wildcard for bypass proxy" into jb-mr2-dev

* commit '05d67f62b7370b3bbe3bf691ae01b8a46dd04606':
  Allow wildcard for bypass proxy
merge in master-release history after reset to master
am f7ad8e39: Merge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev

* commit 'f7ad8e39748087e4e33a511d1c439b72ebd979b9':
  Fix padding so TextViews are baseline aligned.
Import translations. DO NOT MERGE

Change-Id: I4cdb85276f2ff6e50f4978eaad3481a248a52fcb
Auto-generated-cl: translation import
Merge "Import translations. DO NOT MERGE"
am c5a36d90: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'c5a36d903beb7929691b925d8b59664372e6d393':
  Import translations. DO NOT MERGE
am 0fb0d016: Merge "Split User settings into limited and trusted." into jb-mr2-dev

* commit '0fb0d016dd51b0d8b882d92de58f5c2ea28a9208':
  Split User settings into limited and trusted.
merge in master-release history after reset to master
am 02e8ca3e: Merge "Respect user restrictions about adding/removing accounts, sideloading" into jb-mr2-dev

* commit '02e8ca3e9ad966bd523241aaa1eecf58865027a8':
  Respect user restrictions about adding/removing accounts, sideloading
am a8645309: am 0d52fc18: am 9dc478ec: Merge "Add ability to install credentials as other UID"

* commit 'a86453096979d027d65390f657568c945fea1b3d':
  Add ability to install credentials as other UID
am 899e4f27: Merge "Display vibrate icon in volume menu" into jb-mr2-dev

* commit '899e4f27f1866acee29c67e6f19b50308a3b12c3':
  Display vibrate icon in volume menu
am 0f41b49d: Add install support for WIFI UID

* commit '0f41b49d1f33e86ec4e7004f009c074b68a90be6':
  Add install support for WIFI UID
am fee612df: Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev

* commit 'fee612df197ab3da969dff39ecc3df95b931cfae':
  Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode
am ab6a6645: Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev

* commit 'ab6a6645b01312816fe0688c76b5a26948252850':
  Add KeyStore storage type to Settings UI
am 47704d08: am 43366b2c: Merge "Add KeyStore storage type to Settings UI"

* commit '47704d08b8756d78d426100b97a4fa81b81f12b3':
  Add KeyStore storage type to Settings UI
am 26aca80e: am a7ff2a2d: Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev

* commit '26aca80eb1813cfe69450383efd8442805b16da5':
  Follow changes to RestrictionEntry API
Import translations. DO NOT MERGE

Change-Id: I709c77b2c45763a2090875189d88c65d28903030
Auto-generated-cl: translation import