Merge commit '06a111be6d3ccf44de545a084302c2085cbb07de' into eclair-plus-aosp
* commit '06a111be6d3ccf44de545a084302c2085cbb07de':
Import revised translations. DO NOT MERGE
Merge commit '6de9fb390b9eab0dbaf9709db5149eefc18724da' into eclair-plus-aosp
* commit '6de9fb390b9eab0dbaf9709db5149eefc18724da':
Import revised translations. DO NOT MERGE
Merge commit '7c8a08d51389e1c2c0411a1a4a12646880199e01'
* commit '7c8a08d51389e1c2c0411a1a4a12646880199e01':
Use a custom system icon for native processes.
Merge commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b' into eclair-plus-aosp
* commit 'ee52bed514cbee1fade95a9f862e238c4975cd8b':
Use a custom system icon for native processes.
A new field is going to be added to the APN editor.
Authentication type: 4 possible values - None, PAP, CHAP, PAP or CHAP
These strings are too technical for the end user, however these
fields will be pre-populated and the user would not have to change them.
Change-Id: I7df326722fc4aebfe68d2726e2695eda8ea798a9
Merge commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10'
* commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10':
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Merge commit 'b20be6e24a7b546e413a00c51f8079fa7233651b'
* commit 'b20be6e24a7b546e413a00c51f8079fa7233651b':
Rename empty view so that the standard list view implementation
Merge commit 'e1089ad33896f4fe5b75e773813367d700773b6f' into eclair-plus-aosp
* commit 'e1089ad33896f4fe5b75e773813367d700773b6f':
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Merge commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74' into eclair-plus-aosp
* commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74':
Rename empty view so that the standard list view implementation
displays empty list message when list goes empty. Ideally the list is
not empty for running processes and All filter options. so the
message is just set to third party apps
Remove the empty list view logic from code base
Merge commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7'
* commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7':
Add Safety information to Settings > About Phone
Merge commit '72233c9d02f27a21d03f8560cc50132168cf6464'
* commit '72233c9d02f27a21d03f8560cc50132168cf6464':
packages/apps/Setting: Make vkey button haptics part of global haptic setting
Merge commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3' into eclair-plus-aosp
* commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3':
Add Safety information to Settings > About Phone
The Safety information link is stored in a system property, ro.url.safetylegal
If the phone has data connection, select "Safety information" menu will open the
Safety information link. If there is no data connection for the phone, a message will
pop up which ask user to open Safety information link from PC.
Change-Id: Ia46e2e868ebcda93138cb9f00c978d8ac827022a
