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

Merge commit 'a0ac4b1492ae742e2f12138b647ea9781054a1b0' into eclair-mr2

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