am 4ee07862: am b37ad3d0: Merge "Handle default properly to avoid scary logging." into lmp-dev

* commit '4ee07862cbadeb782fbe598e7f334984070d6c5e':
  Handle default properly to avoid scary logging.
Use SwitchPreference in TrustAgentSettings.

Fixes bug 16900059

Change-Id: I52dcfd2a2651f8f770477df3c72176303a9d1b39
am 5a10a8df: Use SwitchPreference in TrustAgentSettings.

* commit '5a10a8df0efcf034077cbfcd28dd2e495b8d0441':
  Use SwitchPreference in TrustAgentSettings.
am a063a84c: am 5a10a8df: Use SwitchPreference in TrustAgentSettings.

* commit 'a063a84ce26092001cdded38b416b13dc073fde4':
  Use SwitchPreference in TrustAgentSettings.
am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev

* commit 'd6d0cd53d00a84619f3f90761ee3907732fac898':
  Bring up factory reset UI when decryption fails but password is correct
am 3007a85e: am d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev

* commit '3007a85e1136d942c6805c9384688b233565d782':
  Bring up factory reset UI when decryption fails but password is correct
am 561d6bc9: Merge "Allow creating last user even if a guest exists." into lmp-dev

* commit '561d6bc9bb3f1473ac67f4bef5edac7b3046a901':
  Allow creating last user even if a guest exists.
am 81fa31a1: am 561d6bc9: Merge "Allow creating last user even if a guest exists." into lmp-dev

* commit '81fa31a104846112c6c7f193ab81a7201ee9914e':
  Allow creating last user even if a guest exists.
Remove indexes for removed hard keyboard options.

Bug: 16027438
Change-Id: If668024e3b7073b49142de7e9aae4a46b4969d40
am bf55863b: Remove indexes for removed hard keyboard options.

* commit 'bf55863b41efc3ad29c752f133f8739aac35d103':
  Remove indexes for removed hard keyboard options.
am f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev

* commit 'f51dacedd8ccbe99584e05320a92adbb8e95abfe':
  Add setting to disable automatic USB audio routing
Fix encryption strings

Bug: 16901855
Change-Id: I7297a88c173d5a5ca03ee404938c9d4bad550110
API review - move confirm credential constants from Intent

Moves constants from Intent to KeyguardManager.

Fixes bug 17006280

Change-Id: I8ee1f534816a3fe823ad44479e227ba6d3675389
Merge "API review - move confirm credential constants from Intent" into lmp-dev
[WifiSetup] Update illustrations

Update illustration assets and support for auto-mirroring for RTL
languages.

Bug: 16888091
Change-Id: I828a13558aff42f2ddb12b9afe123f463c4c1522
Merge "[WifiSetup] Update illustrations" into lmp-dev
am e73b8ccf: Merge "Make sure profile owner is system app" into lmp-dev

* commit 'e73b8ccf37470869e8acb00946c95737a44d54d0':
  Make sure profile owner is system app
am 48ddc94b: am bf55863b: Remove indexes for removed hard keyboard options.

* commit '48ddc94b79ad9d1b831b694d1c2a6c755895dfba':
  Remove indexes for removed hard keyboard options.
am 6a5aad7b: am f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev

* commit '6a5aad7b2e942cf79c245885e95d3e41dd1f0561':
  Add setting to disable automatic USB audio routing
Fix app icons on some Settings screens

App icons appeared as the default icon and sometimes without the corp badge on
Data Usage and Battery screens for applications that were only installed for
the managed profile. This CL fixes the issue.

Bug:16705204
Change-Id: I778d36554feb19f28f3cb9321a291cab3d3e17bb