Merge commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5' into eclair-mr2-plus-aosp * commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5': Rename the term "attribute"/"attr" to "parameter"/param".
Merge commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5' into eclair-mr2-plus-aosp * commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5': Rename the term "attribute"/"attr" to "parameter"/param".