am 9aaa76a7: am 79aedbee: Merge change 26423 into eclair

Merge commit '9aaa76a7af547a34251c4eb480a4aa3d7485b56d'

* commit '9aaa76a7af547a34251c4eb480a4aa3d7485b56d':
  Add support for Acer devices