Merge commit '483deed6f3d91329d02bb37af64f032e4eaa3621'
* commit '483deed6f3d91329d02bb37af64f032e4eaa3621':
b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '2321e1dca0abfdfca421cbd490b3c4f257d96114' into eclair-mr2-plus-aosp
* commit '2321e1dca0abfdfca421cbd490b3c4f257d96114':
b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Bug: 2325451.
This change also improves the UI by returning an empty drawable of the appropriate
size to make sure all labels line up correctly in the list.
Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-mr2
* commit '052ad24219bbb170d9d028a460741524a768915a':
b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit '052ad24219bbb170d9d028a460741524a768915a' into eclair-plus-aosp
* commit '052ad24219bbb170d9d028a460741524a768915a':
b/2323277 Fixed race condition where the user clicks on the dialog before dismiss() is processed.
Merge commit 'dd79e75a0afe65721fcb95b17bd96199a9b7a5b3'
* commit 'dd79e75a0afe65721fcb95b17bd96199a9b7a5b3':
Add Traditional Chinese versions of the time zone names.
Merge commit '0a0225418366e4502e18e414e71a04d575b1a47e'
* commit '0a0225418366e4502e18e414e71a04d575b1a47e':
b/2320107 NPE when receiving a Undock event without a device
Merge commit '20428ffbc1ed6931e55beeb1523442e37e9a2524' into eclair-mr2-plus-aosp
* commit '20428ffbc1ed6931e55beeb1523442e37e9a2524':
Add Traditional Chinese versions of the time zone names.
Merge commit '38badc8ba086febc93a905de91dccefa03cc1aae' into eclair-mr2-plus-aosp
* commit '38badc8ba086febc93a905de91dccefa03cc1aae':
b/2320107 NPE when receiving a Undock event without a device
Merge commit '362d5b17c0ff8f8f7207bbdec9c952d19c83b3be'
* commit '362d5b17c0ff8f8f7207bbdec9c952d19c83b3be':
b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-mr2
* commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
b/2320107 NPE when receiving a Undock event without a device
Merge commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a' into eclair-plus-aosp
* commit '9463c2f8d5f09ef9cc015405640bbf845f0f7a8a':
b/2320107 NPE when receiving a Undock event without a device
Merge commit 'bd0b2542a848bb6cd5a6055ee870a63732ae061d' into eclair-mr2-plus-aosp
* commit 'bd0b2542a848bb6cd5a6055ee870a63732ae061d':
b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-mr2
* commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef':
b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit '3681cfb83b0e9d02c71330fda25edaaf17bb0ba6' into eclair-mr2-plus-aosp
* commit '3681cfb83b0e9d02c71330fda25edaaf17bb0ba6':
Fix desk dock getting stuck after unpairing.
Merge commit '41fccf2cb3cc31a79bd59492990207247f0a5c64' into eclair-mr2-plus-aosp
* commit '41fccf2cb3cc31a79bd59492990207247f0a5c64':
Fix auto connection of A2DP profile.
Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-mr2
* commit '613549a622eac8278c9f81a1df83484c256652bf':
Fix desk dock getting stuck after unpairing.
Merge commit 'b37c4a09bbf9535db984b7165612184b4024a01e'
* commit 'b37c4a09bbf9535db984b7165612184b4024a01e':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit 'd7a2f48458b5545b82ba83746753449c09c6daf1'
* commit 'd7a2f48458b5545b82ba83746753449c09c6daf1':
Display icons in the correct density in the ActivityPicker.
Merge commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5' into eclair-mr2
* commit '6e3ee10a99b4d71ffe8f2473dcb8c6dbf4da0ed5':
Fix auto connection of A2DP profile.
Merge commit '11c546162a489be5cc3a698e5c9f0bc4d3e65cab' into eclair-mr2-plus-aosp
* commit '11c546162a489be5cc3a698e5c9f0bc4d3e65cab':
Import revised translations. DO NOT MERGE
Merge commit '5217a122d70dfeb74f0a2b0e0a73d920ec9d58d7' into eclair-mr2-plus-aosp
* commit '5217a122d70dfeb74f0a2b0e0a73d920ec9d58d7':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit '20b0ae927ef82f8dd31a1c7a1b3784caaf88bfa0' into eclair-mr2-plus-aosp
* commit '20b0ae927ef82f8dd31a1c7a1b3784caaf88bfa0':
b/2314560 Prevent PIN dialog from showing up on undocked docks
Merge commit '1c96b2cd6da03f978686be572c63a6a6fd4be1ef' into eclair-mr2-plus-aosp
* commit '1c96b2cd6da03f978686be572c63a6a6fd4be1ef':
Display icons in the correct density in the ActivityPicker.
Merge commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8' into eclair-mr2
* commit 'e273289cfb74e08ef0ab35afe2ca34a167a533d8':
Import revised translations. DO NOT MERGE
Merge commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda' into eclair-mr2
* commit '1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda':
b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-mr2
* commit '488a80a7b111f5906bf51101785a95a6c640d265':
b/2314560 Prevent PIN dialog from showing up on undocked docks
Merge commit 'a9f9031ba35433a7e009da6099b17cf603372a70' into eclair-mr2
* commit 'a9f9031ba35433a7e009da6099b17cf603372a70':
Display icons in the correct density in the ActivityPicker.
Merge commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef' into eclair-plus-aosp
* commit 'a87f2fd7d82e5055e0f9ea2c93704ed0b58f27ef':
b/2320107 Fixed NPE for class bits. Docks do not have class bits.
Merge commit 'a702cab6cf99c6c2168f0662d9c15adbf76011ab'
* commit 'a702cab6cf99c6c2168f0662d9c15adbf76011ab':
Wifi diagnostic app to enable debug and provide information
Merge commit '2ff62e2c7b1ecf2f4463cc8b683ea52e32337b9d' into eclair-mr2-plus-aosp
* commit '2ff62e2c7b1ecf2f4463cc8b683ea52e32337b9d':
Wifi diagnostic app to enable debug and provide information
