am 8b633873: am 5f9e0abe: Merge change I5a66bbdf into eclair

Merge commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b' into eclair-mr2-plus-aosp

* commit '8b6338739b0be74baf3429c3276c5fe9bffb5b5b':
  Rename the layout device from ION to ADP2.