merge in master-release history after reset to master
Import translations. DO NOT MERGE

Change-Id: I29a30e6c327e84cb2f41a123a168baf6906e577b
Auto-generated-cl: translation import
am 302bd5c7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '302bd5c78a860081ce63d7faba9b20c7d9af4092':
  Don't show ApnEditor as a dialog
  Import translations. DO NOT MERGE
  Allow hidden apps to opt-out
  resolved conflicts for merge of 5d21820a to jb-mr2-dev
  Fix issue #9074296: Device Admins can activate in a way...
  Ensure all active Device Admins are listed.
Fix an NPE in WifiP2pSettings UI

The NPE happens becase we save a references to the group that is to be
deleted, when the confirmation dialog is being shown to the user. We lose
that reference if orientation is changed (because the UI creates a new
WifiP2pSettings to interact with).

The fix is to save the name of the group that is being deleted in
persistent store, and re-select the group based on that.

Bug: 9004915
Change-Id: I1387a5b17fa2773748f4c8b34adddfc9516cfcf3
Merge "Import translations. DO NOT MERGE"
Merge "Remove Battery settings if battery is not present"
Merge "Fix an NPE in WifiP2pSettings UI"
Don't show tether settings in shortcut picker

On devices that don't have tethering options, don't allow user
to create a shortcut to the tether settings.

Bug: 6865610
Change-Id: I2ebbd6ef98391ef3fe74130570bd9b70108a2aa9
Merge "Don't show tether settings in shortcut picker"
merge in master-release history after reset to master
Import translations. DO NOT MERGE

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

Change-Id: Ib20c522937dfe8b4534c108832f2c04f3115c546
Auto-generated-cl: translation import
am 0117cc7c: Import translations. DO NOT MERGE

* commit '0117cc7ce562569d32fc18341111100068d11eff':
  Import translations. DO NOT MERGE
am b45bac74: (-s ours) am 0117cc7c: Import translations. DO NOT MERGE

* commit 'b45bac74e9b6e25d131e894c7b98f899f0adf122':
  Import translations. DO NOT MERGE
Import translations. DO NOT MERGE

Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
Reconcile with jb-mr2-release - do not merge

Change-Id: I5a23b290d9a03dbae2ac2cbb7bcdebe84a773c55
am a5520e76: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'a5520e76911421956c7c4fe4e28ac60c64a276b9':
  Import translations. DO NOT MERGE
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Id19d096814424b1c1253d633f9bc0e18d53dc360
am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit 'bb3a943d1bd9cb8f7cca76850d432cfb2a6307e1':