| commit | 7a2de3d0ba146217e19d8dba74ff82000b0e676f | [log] [tgz] |
|---|---|---|
| author | Sara Ting <sarating@google.com> | Fri Aug 31 15:06:32 2012 -0700 |
| committer | Sara Ting <sarating@google.com> | Fri Aug 31 15:06:32 2012 -0700 |
| tree | dd57a709984161622b96faade4a22e7ea1e6b633 | |
| parent | a3a27fba18735a17b339afce46b12587be6f6b70 [diff] | |
| parent | 013fda07b0ab9d0823097bd2050b48caf2ce5ab0 [diff] |
resolved conflicts for merge of 013fda07 to ics-ub-calendar-burgundy Change-Id: Ia398c0dc2d7eed35e9d1f172e23e0f5c38923be3