OSDN Git Service

am 0c75b2d2: Merge change I80790bdb into eclair
authorMichael Chan <mchan@android.com>
Tue, 8 Dec 2009 04:50:54 +0000 (20:50 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 04:50:54 +0000 (20:50 -0800)
commit4e1e2d2bf674e5edf5a09e6788690851ae9a53f3
treef9518d40da8ebd6da6f25de644cca6125f30f327
parentb659c9e4102304b9c41558a2b8eaccc03c96a9e2
parent0c75b2d2dc35b88d5cb9db96afc72ed074ca5350
am 0c75b2d2: Merge change I80790bdb into eclair

Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp

* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
  b/2296110 Dialog for setting up dock audio.
AndroidManifest.xml
res/values/strings.xml