am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.

Merge commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa' into eclair-mr2

* commit 'c065348ebaf1ea9301d7b96633bea4de8c78c2aa':
  Show an error message when the remote side cancels the authentication
am 9ef9801f: (-s ours) am 0512f51f: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '9ef9801f6f42d25b7e539262ebfec428546107fc' into eclair-mr2

* commit '9ef9801f6f42d25b7e539262ebfec428546107fc':
  Import revised translations.  DO NOT MERGE
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp
am db99bb36: am c065348e: Show an error message when the remote side cancels the authentication and show OPP device list correctly.

Merge commit 'db99bb36449f34d6f26f61092a6c77de1bb98c91' into eclair-mr2-plus-aosp

* commit 'db99bb36449f34d6f26f61092a6c77de1bb98c91':
am 5204b662: am 9ef9801f: (-s ours) am 0512f51f: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '5204b662a0c155f695cf4e7b6341872a803a7e80' into eclair-mr2-plus-aosp

* commit '5204b662a0c155f695cf4e7b6341872a803a7e80':
Push down the supplicant-specific double-quote handling to framework.

So we are able to connect to AP with ssid containing double-quotes.
am d2fa30ba: Merge change I28f1a0fc into eclair

Merge commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f'

* commit 'd2fa30baee10b755704beded16e8cf0ab2eb502f':
  WifiSettings: use keystore namespace instead of blobl.
am c49ca127: Merge change I02f58e89 into eclair

Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c'

* commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c':
  SecuritySettings: clean up.
am 51e97b33: Merge change Ia7c57145 into eclair

Merge commit '51e97b33d265709da2aa69c861994574a0544aaa'

* commit '51e97b33d265709da2aa69c861994574a0544aaa':
  SecuritySettings: remove trailing spaces.
am b83ff4af: Merge change Ibf07c83d into eclair

Merge commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465'

* commit 'b83ff4af8c359fd5cea276318f0c9e4487ec7465':
  SecuritySettings: remove debug messages.
am 1e98dfb4: Merge change I446bf8b5 into eclair

Merge commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e'

* commit '1e98dfb480f7c7be6bd2c0dc752d7742765cd74e':
  SecuritySettings: minor tuning.
am e61a2403: Merge change I844d3db3 into eclair

Merge commit 'e61a2403a64bd711dcf3abb36594eb6545601c80'

* commit 'e61a2403a64bd711dcf3abb36594eb6545601c80':
  SecuritySettings: set the check box before further processing.
am 9767612c: Merge change If764d20a into eclair

Merge commit '9767612cc8207f906173dc9459b45cd07d881c4e'

* commit '9767612cc8207f906173dc9459b45cd07d881c4e':
  SecuritySettings: fix a the status before handling the intent.
am 85ed0862: Merge change I454a0dbf into eclair

Merge commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6'

* commit '85ed086217427308c3b2df5b4ba77fa5ae7326e6':
  SecuritySettings: revert "minor tuning".
am 6e6d2362: Merge change I25f2afba into eclair

Merge commit '6e6d2362ccd119e51839a4f306c26783f634ab15'

* commit '6e6d2362ccd119e51839a4f306c26783f634ab15':
  Check if a device is added to the cache before returning.
am 9ff282bb: (-s ours) am 6de9fb39: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '9ff282bb755829145245d4730e6f87c042da1de4'

* commit '9ff282bb755829145245d4730e6f87c042da1de4':
  Import revised translations.  DO NOT MERGE
am 059c3f5d: am a8f2f72d: Add the auth_alg field back.

Merge commit '059c3f5d1eb52a7564208464b1d0f76af509e891'

* commit '059c3f5d1eb52a7564208464b1d0f76af509e891':
  Add the auth_alg field back.
am a89d3d35: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp

Merge commit 'a89d3d3591c4457d46f1f2726c05ae8c2b3dc708'

* commit 'a89d3d3591c4457d46f1f2726c05ae8c2b3dc708':
am b01a6f96: am 0bc5e275: SecuritySettings: reduce 1 access to KeyStore and clean up.

Merge commit 'b01a6f96c3da6d5ce718eca38f2f4185570a431b'

* commit 'b01a6f96c3da6d5ce718eca38f2f4185570a431b':
  SecuritySettings: reduce 1 access to KeyStore and clean up.
am ec77e2b0: am f43b1a9d: am 98d76cc9: Remove STOPSHIP debug log.

Merge commit 'ec77e2b0fa087efb44587bf08d790abf445d702b'

* commit 'ec77e2b0fa087efb44587bf08d790abf445d702b':
  Remove STOPSHIP debug log.