am aecda495: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'aecda4950b9ef92285bb1755183c2b10e6c2c2c5':
  Show the license dialog only if the activity is still showing
Avoid re-creating a user when activity is resumed

onCreate() was getting called again, resulting in another user being
created. Keeping the new userid across pause/resume.

Change-Id: Id7930227895e95a60a77efddf361ab9408a8f797
Merge "Settings: Fix crash seen when setting the radio band"
am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"

* commit '52d996edeb7958d386bbf6655e9acfec3b10fdf2':
  Settings: Fix crash seen when setting the radio band
am 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"

* commit '41446512cfa6e009187b7cc67fa34a29f82ddccc':
  Settings: Fix crash seen when setting the radio band
am 5e61ba55: am 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"

* commit '5e61ba5576d912c42af004510484a77625a96d44':
  Settings: Fix crash seen when setting the radio band
am d3d801c9: am 5e61ba55: am 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"

* commit 'd3d801c9a9a7876d7b73f930db3c8b1395775597':
  Settings: Fix crash seen when setting the radio band
Settings: Fix crash seen when setting the radio band

When the user presses back before the set radio band
result dialog is shown, crash is seen as the activity
associated with this is already finishing.

Check the activity status before displaying the
set radio band result alert dialog.

Change-Id: I34104773f5cce0be6d0021823b2889aad0fdb945
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 39317
Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev
am b1491842: Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev

* commit 'b1491842c48fd0cda2539ee98a30fa82a744af15':
  Settings: Fix crash seen when setting the radio band
am 07e3716b: am b1491842: Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev

* commit '07e3716b7e485982b9b024249d2f7a9b09e529df':
  Settings: Fix crash seen when setting the radio band
Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev
am 44120d19: Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev

* commit '44120d19f33f14b0a6f1b2c656335a476de406ee':
  Avoid re-creating a user when activity is resumed
am af71f2ac: am 44120d19: Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev

* commit 'af71f2ac9423918be8ac1191df9c223a2744bb38':
  Avoid re-creating a user when activity is resumed
Always-on VPN.

Adds support for always-on VPN profiles. Users pick an always-on VPN
from list of existing VPN profiles, which must use an IP address for
both VPN server and DNS.  Moved "add" operation into action bar.

Bug: 5756357
Change-Id: I4c7ed7f2a3b027be1baf65c08213336a61f3acfe
merge in jb-mr1-release history after reset to jb-mr1-dev
Merge "Always-on VPN." into jb-mr1-dev
Import translations. DO NOT MERGE

Change-Id: I61710e208f305569f238c02cc7aa8a3da8a0154b
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: Id789c1dba9f7f331cf985d1470a68161e770ac84
Auto-generated-cl: translation import
am da40470d: Merge "Always-on VPN." into jb-mr1-dev

* commit 'da40470daae8c71fe3144970e7bb5b0d32ec6b9d':
  Always-on VPN.