Merge "Update resources documentation with new qualifiers." into honeycomb-mr2