Merge commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b' into eclair-mr2-plus-aosp * commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b': Rename the layout device from ION to ADP2.
Merge commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b' into eclair-mr2-plus-aosp * commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b': Rename the layout device from ION to ADP2.