| commit | f60573d19086a15a11fbdb94f196dc4ed426823b | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Sep 10 18:24:46 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 18:24:46 2009 -0700 |
| tree | 26da818618f50fb714636c5be8af29b6432aa75a | |
| parent | 5e9dc51fe09fb05943db728b063751e35b5ddb0e [diff] | |
| parent | bd75da5da4a2dea7cb57a157f63c76bfb0c4d081 [diff] |
am bd75da5d: am 38a1081c: Merge change 24514 into eclair Merge commit 'bd75da5da4a2dea7cb57a157f63c76bfb0c4d081' * commit 'bd75da5da4a2dea7cb57a157f63c76bfb0c4d081': Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.