am 79aedbee: Merge change 26423 into eclair

Merge commit '79aedbee8ff9d9c37ae063fc970632faa3f90227' into eclair-plus-aosp

* commit '79aedbee8ff9d9c37ae063fc970632faa3f90227':
  Add support for Acer devices