am 7ceb387e
: (-s ours) Merge change Ib720a080 into eclair
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-mr2 * commit '7ceb387ee601655ba72264646e3d8ecf2d74c138': Updated icons for Settings. DO NOT MERGE
This commit is contained in: