tree dd57a709984161622b96faade4a22e7ea1e6b633
parent a3a27fba18735a17b339afce46b12587be6f6b70
parent 013fda07b0ab9d0823097bd2050b48caf2ce5ab0
author Sara Ting <sarating@google.com> 1346450792 -0700
committer Sara Ting <sarating@google.com> 1346450792 -0700

resolved conflicts for merge of 013fda07 to ics-ub-calendar-burgundy

Change-Id: Ia398c0dc2d7eed35e9d1f172e23e0f5c38923be3