| commit | 79b0159bfcf4a5cd1e83b1871e2fb8010413b423 | [log] [tgz] |
|---|---|---|
| author | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | Tue Oct 13 14:22:33 2009 -0700 |
| committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | Tue Oct 13 14:22:33 2009 -0700 |
| tree | 7fdbf192aa48747e8325c6696eae1e5c4814272e | |
| parent | 25fc2758c0b3c2967f10bdd5123a6c5519f8abd7 [diff] | |
| parent | f6925aae0ef7b92d548ae1234f0f594241eb7714 [diff] |
resolved conflicts for merge of f6925aae to master (skipped res/values-es-rUS/strings.xml)