Merge "Fix issue with project resources overriding framework resources." into gingerbread