commit | d23c361ff1af8cbe6ada7f40ad8b7e46f51487fb | [log] [tgz] |
---|---|---|
author | Andy Stadler <stadler@google.com> | Tue Jan 04 18:37:44 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 04 18:37:44 2011 -0800 |
tree | bf564969efb451662b4fccc6b01b5ca527bc4c94 | |
parent | 38a495fed9f106e0ac312a5a6d987a375f69dfff [diff] | |
parent | 62ee3f4cac15e94dccb7795334c0355aa0e80228 [diff] |
am 62ee3f4c: (-s ours) am ec988c2f: DO NOT MERGE Added/updated Yahoo provider settings * commit '62ee3f4cac15e94dccb7795334c0355aa0e80228': DO NOT MERGE Added/updated Yahoo provider settings