am f07f0d9b: am 6be075d6: Check the user limit before showing an ADD menu item

* commit 'f07f0d9b53094483cb0b69c5fffa62e547a61e9c':
  Check the user limit before showing an ADD menu item
am 924ff036: (-s ours) am 44a3cb5c: Merge "Fix on/off switch for Android Beam." into jb-mr1-dev

* commit '924ff0366a044e6c2dbe7bd926406bf22ed0baa2':
  Fix on/off switch for Android Beam.
am 506c1015: am cb122bd1: Merge "Wifi settings are in a different namespace now" into jb-mr1-dev

* commit '506c101577aa8a876b6d939833c34e3b7a6737d3':
  Wifi settings are in a different namespace now
am c3682211: am cfc1bec2: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev

* commit 'c368221133f446503594616b45c15a6b350eed13':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
am 0c717bd9: am fc76a78c: Include user identifier in external storage paths.

* commit '0c717bd9530a9b483ca4f7698d8acf4b5ddf6bea':
  Include user identifier in external storage paths.
am c737e92d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c737e92d4573ae6809f86c812d563ab88fe95d8c':
  Wifi settings are in a different namespace now
  Update Settings app to use new namespace for airplane-mode settings
am 3a84f707: am 01bd0f00: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev

* commit '3a84f70772df1d5c38a4fdd553add9a39ef2ddb6':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
am 5f55c55b: am 4a596b19: Merge "Correct settings namespace for auto time/tz" into jb-mr1-dev

* commit '5f55c55b3f419b2e848b44b372b5649d5873f2ff':
  Correct settings namespace for auto time/tz
am d9c5310b: am 43db5267: Tell contacts to return back to Settings when done editing the profile info

* commit 'd9c5310bfccdd964fc4e34ca8b4204c0008db1ba':
  Tell contacts to return back to Settings when done editing the profile info
am cf50b245: am 2001a179: Merge "Don\'t crash during setup of secondary users" into jb-mr1-dev

* commit 'cf50b2452191b043e86b513fa109e756c2c7e332':
  Don't crash during setup of secondary users
am 7786df05: am 4a095381: Merge "Iteration on multi-user Storage UI." into jb-mr1-dev

* commit '7786df0508f1de403155a1518d99b509d59e763c':
  Iteration on multi-user Storage UI.
am 18914118: am b6d7c9c6: Merge "Multi-user battery settings." into jb-mr1-dev

* commit '18914118963b59705052049505b1862c367d3cf7':
  Multi-user battery settings.
am 1495043c: am 9310f85d: Merge "Protect self from async change of BluetoothPan" into jb-mr1-dev

* commit '1495043cdebf279a22cf3f87dcbf4e482804e998':
  Protect self from async change of BluetoothPan
am 69402162: am a9286147: Merge "Adding ability to filter for certain types of widgets in picker activity" into jb-mr1-dev

* commit '6940216295567926bd04bf23bc5a9740ac054356':
  Adding ability to filter for certain types of widgets in picker activity
am a733a653: am 8227e303: Add support for setting lock widgets

* commit 'a733a653f6ed213ea75bf789290f578b0ff9452b':
  Add support for setting lock widgets
am 93588f63: am 3a932f33: Merge "Treat cache storage usage as available space." into jb-mr1-dev

* commit '93588f6323b83a4313456b1918af25a6bc5f8f2f':
  Treat cache storage usage as available space.
am d477204d: am 767597b2: Merge "Watch for profile changes and push to user manager" into jb-mr1-dev

* commit 'd477204da56b16c4aeee1c26cab8669dcc502756':
  Watch for profile changes and push to user manager
am b0d22528: am bc7f678c: Merge "Fix crash in Settings > Security" into jb-mr1-dev

* commit 'b0d2252897fcc6a0e80b99a3bf856a4a13ab06b8':
  Fix crash in Settings > Security
am 70b37e77: am b2f4efb7: Correct strings for Plaform Anti-malware

* commit '70b37e77c7c885f3a828fe6fbe5ebf8ebf3ca2ce':
  Correct strings for Plaform Anti-malware
am a8dbb9b8: am 38305fb1: Data usage multi-user support.

* commit 'a8dbb9b8e46d90f77617f343f3ccab7d9109c116':
  Data usage multi-user support.