Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp * commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156': Strings for new Dock settings screen, to get started on the L10N.
Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp * commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156': Strings for new Dock settings screen, to get started on the L10N.