am 2c45e913: Merge "Add Calendar Color Index to CalendarEntity"
am 2c45e913: Merge "Add Calendar Color Index to CalendarEntity"

# Via Alon Albert (1) and Android (Google) Code Review (1)
* commit '2c45e913734a64460c6dcf5b831a32a0af5ba5c1':
  Add Calendar Color Index to CalendarEntity

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base