commit | a1758ebc25d649994b2b9da8cdfd3f01602293e6 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Sun Sep 26 17:57:40 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 26 17:57:40 2010 -0700 |
tree | f9ba287863e83a0e8e9c0a9171f2c9842fbcc2dc | |
parent | d25d87c7ba8bbbbcad771695a7085f227bac8a1b [diff] | |
parent | fc3aab36626a704a45db450ad7e7d14f45f748eb [diff] |
am fc3aab36: am 0dd360c2: reconcile froyo-release into gingerbread Merge commit 'fc3aab36626a704a45db450ad7e7d14f45f748eb' * commit 'fc3aab36626a704a45db450ad7e7d14f45f748eb': Increase EmailServiceProxy timeout for validation attempts Block oversize attachments from being sent