Michael Chan 41eb38412a am 0c75b2d2: Merge change I80790bdb into eclair ...

Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-mr2

* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
  b/2296110 Dialog for setting up dock audio.

2009-12-07 20:50:32 -08:00

..

settings

am 0c75b2d2: Merge change I80790bdb into eclair

2009-12-07 20:50:32 -08:00