am 52fb569a: (-s ours) am b473ded2: (-s ours) Reconcile with jb-release - do not merge

* commit '52fb569ab929809fac01f860af88e1160fa0aa4d':
am 75a1e421: am 98e53a1f: resolved conflicts for merge of 08336552 to jb-dev-plus-aosp

* commit '75a1e421231698564257594d26b31cca390dc221':
  Adding contextual "Voice Mail" text to in-call dialpad.
am 6046c0d0: Fix for screen staying on at quick response dialog

* commit '6046c0d05994e434b7706fa1e3aec03d5f066d75':
  Fix for screen staying on at quick response dialog
am 7fa5266a: Explicitly specify current user everywhere home is started.

* commit '7fa5266a69d52606144302c0a3a92645ab64b095':
  Explicitly specify current user everywhere home is started.
am 7685f0dd: (-s ours) am 14ab81f2: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '7685f0dd691b0e2b46a985dcfaab8df70c282600':
  Adding contextual "Voice Mail" text to in-call dialpad.
am 859760f7: Merge "Don\'t crash phone app when running as non-primary user." into jb-mr1-dev

* commit '859760f72162c86cc383dc851253f4d33325af7e':
  Don't crash phone app when running as non-primary user.
am d9d08ebf: Fix phone-related notification actions.

* commit 'd9d08ebf0c254ecbd6dae4e7f02b484c37d49aae':
  Fix phone-related notification actions.
am a276b79f: Merge "Correct classname for BroadcastReceiver in manifest" into jb-mr1-dev

* commit 'a276b79f956be7217d40e56b0842258075248e02':
  Correct classname for BroadcastReceiver in manifest
Reconcile with jb-mr1-release - do not merge

Change-Id: I21da9286e4cb18e84c740f77c69e71727118f3b2
am ef918bb5: Suppress location information for non-active users.

* commit 'ef918bb5a3feaf175b54a3aed75f5645e3d14a48':
  Suppress location information for non-active users.
am ef918bb5: Suppress location information for non-active users.

* commit 'ef918bb5a3feaf175b54a3aed75f5645e3d14a48':
  Suppress location information for non-active users.
Reconcile with jb-mr1-release - do not merge

Change-Id: I11921f761d090d5e9959ad434cac1e635cd19c79
am cc01c5ef: Glowview showing above incall screen.

* commit 'cc01c5efd47627e1adfc8fe606957529ac84411f':
  Glowview showing above incall screen.
am cc01c5ef: Glowview showing above incall screen.

* commit 'cc01c5efd47627e1adfc8fe606957529ac84411f':
  Glowview showing above incall screen.
am cf130dbf: Merge "Airplane mode (and other) setting moved to global." into jb-mr1-dev

* commit 'cf130dbf276b61d71350f4a77aa58242cea30067':
  Airplane mode (and other) setting moved to global.
am cf130dbf: Merge "Airplane mode (and other) setting moved to global." into jb-mr1-dev

* commit 'cf130dbf276b61d71350f4a77aa58242cea30067':
  Airplane mode (and other) setting moved to global.
am d6d79008: Merge "build break fix" into jb-mr1-dev

* commit 'd6d79008f0d4c0865049cd3091fe5f4b286abd4d':
  build break fix
am d6d79008: Merge "build break fix" into jb-mr1-dev

* commit 'd6d79008f0d4c0865049cd3091fe5f4b286abd4d':
  build break fix
am 25add64b: Update references to migrated global settings.

* commit '25add64b1b5553207de50ee993375f4188eacb75':
  Update references to migrated global settings.
am 25add64b: Update references to migrated global settings.

* commit '25add64b1b5553207de50ee993375f4188eacb75':
  Update references to migrated global settings.