Measurement of CP observables in B +/- -> DK +/- and B +/- -> D pi +/- with two- and four-body D decays