Merge commit '38a1081cad9385073d80d358decf04f6b2fd5723' into eclair-plus-aosp * commit '38a1081cad9385073d80d358decf04f6b2fd5723': Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
Merge commit '38a1081cad9385073d80d358decf04f6b2fd5723' into eclair-plus-aosp * commit '38a1081cad9385073d80d358decf04f6b2fd5723': Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.