Merge "Remove content flags to indicate */* support." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 03:50:59 +0000 (03:50 +0000)]

Trivial merge