OSDN Git Service

resolved conflicts for merge of f6925aae to master (skipped res/values-es-rUS/strings...
authorandroid-build SharedAccount <android-build@sekiwake.mtv.corp.google.com>
Tue, 13 Oct 2009 21:22:33 +0000 (14:22 -0700)
committerandroid-build SharedAccount <android-build@sekiwake.mtv.corp.google.com>
Tue, 13 Oct 2009 21:22:33 +0000 (14:22 -0700)

Trivial merge