Merge "move resources" into honeycomb-mr2