Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1