Trisections in CP^2, II