tree bbe93fd1e403df2045295abba83c91e7a4b28534
parent 5f9e0abed17ab1197a0868729232cb2c2024cef2
parent b624370d795cd1e17fcd9960c98c01463c23757f
author Xavier Ducrohet <xav@android.com> 1258404617 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258404617 -0800

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

Merge commit 'b624370d795cd1e17fcd9960c98c01463c23757f' into eclair

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