am 90dad640: am 8bce7c37: Merge "UI compliance for WifiSettings" into jb-mr2-dev

* commit '90dad6404c2810f9f4110ecec94000c84d7e456d':
  UI compliance for WifiSettings
am 868acab2: Merge "Rename limited users to restricted profiles" into jb-mr2-dev

* commit '868acab2a0e82330f6b278f4f93284ca1b6e6225':
  Rename limited users to restricted profiles
am 7200ae73: am 868acab2: Merge "Rename limited users to restricted profiles" into jb-mr2-dev

* commit '7200ae73c784b6c180f44dc4a5da033ae4c3ca2d':
  Rename limited users to restricted profiles
am d346a1ca: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev

* commit 'd346a1ca2d78df4532bf103e150610a5dbc948ce':
  The touch exploration capability is dynamically granted pre-JellyBeanMR2.
am d8e88735: am d346a1ca: Merge "The touch exploration capability is dynamically granted pre-JellyBeanMR2." into jb-mr2-dev

* commit 'd8e88735c1c801c3ca54bb5caec2a0291bfd9559':
  The touch exploration capability is dynamically granted pre-JellyBeanMR2.
merge in master-release history after reset to master
am 90dcd746: Disabled apps should also be shown in restricted profiles app list

* commit '90dcd7469b7e776f508a0767b9db46005af0e8da':
  Disabled apps should also be shown in restricted profiles app list
am f6d483e6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'f6d483e6c9c8ee7999d1380b18bf9f30539af228':
  Import translations. DO NOT MERGE
am 19576444: am 90dcd746: Disabled apps should also be shown in restricted profiles app list

* commit '1957644448f5874fa82f8313674baa1c49d9ca94':
  Disabled apps should also be shown in restricted profiles app list
am 740afcb6: am f6d483e6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '740afcb64bb967bb4eada7f7bb071706378d818a':
  Import translations. DO NOT MERGE
am 410e2df4: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev

* commit '410e2df458328d5375b35ef9a610da240293d06b':
  CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
am 77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev

* commit '77f71cb226203bf3f87eec749296feb3ecd18f43':
  Follow API changes to NotificationListener.
am 0cb93523: Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev

* commit '0cb93523b261c8779119ffa1cd7a45cf2d6b3814':
  Revert "Disabled apps should also be shown in restricted profiles app list"
am 259668d8: am 410e2df4: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev

* commit '259668d82ffb66c35a97ea5fff8acf39d948019d':
  CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.
am 1344ec19: am 77f71cb2: Merge "Follow API changes to NotificationListener." into jb-mr2-dev

* commit '1344ec191894e88c998ff091c2afc16e870c46bc':
  Follow API changes to NotificationListener.
am c3e973c5: am 0cb93523: Merge "Revert "Disabled apps should also be shown in restricted profiles app list"" into jb-mr2-dev

* commit 'c3e973c5da358489f6b7042d5be982e4e7ea6d00':
  Revert "Disabled apps should also be shown in restricted profiles app list"
am a7a93784: Always include default system IMEs for restricted profiles

* commit 'a7a93784d1f9798d37cb618def1a558f8d626f0f':
  Always include default system IMEs for restricted profiles
am 4424d159: am a7a93784: Always include default system IMEs for restricted profiles

* commit '4424d1594968909c1c261bbd06094677906bbfb2':
  Always include default system IMEs for restricted profiles
Import translations. DO NOT MERGE

Change-Id: I4e1ef0256b87fef9461cd8750f9a5446eba9e91b
Auto-generated-cl: translation import
Merge "Import translations. DO NOT MERGE"