am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config...
am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config handling." into honeycomb-mr2
* commit 'c058d386':
Small fixes and cleanup of resource config handling.