Merge "wifi-display: change string to "In use" instead of "Busy""
am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '2db8ca13a781be5489df614a5513240493edaeed':
  Import translations. DO NOT MERGE
am e84b20ba: (-s ours) am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'e84b20ba2ff70fd4eff8d213dc9f89f1f57f15c1':
  Import translations. DO NOT MERGE
Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev
am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev

* commit 'f3e827e83da8d6aa70850c85bbe87d2f9feb82b1':
  Don't show ApnEditor as a dialog
am 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev

* commit '29294d8408c3a754ea118160d29931e5646a5e1a':
  Don't show ApnEditor as a dialog
Ensure all active Device Admins are listed.

Bug: 9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
Fix issue #9074296: Device Admins can activate in a way...

...that makes it impossible to deactive/uninstall them

Don't allow device admins to directly launch the add UI if
they are malformed.

Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
resolved conflicts for merge of 5d21820a to jb-mr2-dev

Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
Allow hidden apps to opt-out

When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.

Bug: 8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
Import translations. DO NOT MERGE

Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
Don't show ApnEditor as a dialog

Else it would be missing the menu buttons.

Bug: 7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I7d22fa6b33c4e77725ae40de89fa6d83be4e8551
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"