Merge commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8' into eclair-plus-aosp * commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8': Add final to appropriate variables.
Merge commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8' into eclair-plus-aosp * commit 'f2bed60bd4921bf71a9cf05b46f000f1cdb20af8': Add final to appropriate variables.