am dd138bf1: am a0ac4b14: (-s ours) am b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)

Merge commit 'dd138bf16096156754a0d3d7c94c3800bbc046d6' into eclair-mr2-plus-aosp

* commit 'dd138bf16096156754a0d3d7c94c3800bbc046d6':
  Rename the layout device from ION to ADP2. (do not merge)