Jim Miller f60573d190 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.
2009-09-10 18:24:46 -07:00
..