commit | 33e0f3b71778b5e1c7f584b45d2a1dbcf4424caf | [log] [tgz] |
---|---|---|
author | Erik <roboerik@android.com> | Fri Sep 10 15:04:04 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 10 15:04:04 2010 -0700 |
tree | 747642208345e249db26de68de92a160009ded7e | |
parent | c4aca7f1855cc1b0fdbd4db078fec2d72bd54be0 [diff] | |
parent | 7e011e5818b3f325836a617d395025b8eed91b83 [diff] |
am 7e011e58: (-s ours) am fe3a17f2: Merge "Make edit event use the home tz. Do not merge" into gingerbread Merge commit '7e011e5818b3f325836a617d395025b8eed91b83' * commit '7e011e5818b3f325836a617d395025b8eed91b83': Make edit event use the home tz. Do not merge