OSDN Git Service

Merge change 24514 into eclair
authorAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Sep 2009 01:12:11 +0000 (21:12 -0400)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Sep 2009 01:12:11 +0000 (21:12 -0400)
commit09c5013b43d0bd1e96fd67d56ca2ffa1bc8e07f9
tree5a9247f35f2ba7be849680bf24f655f578bc6109
parentc4df17dc7311659ff8cd5a9a95f89f8649db83eb
parent1d5ca47adf581f5b7875fb88024300471cccc14a
Merge change 24514 into eclair

* changes:
  Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.