8d5250c601
Merge commit '2e2465497c08061cccf4908e49095f2d19a35eea' into gingerbread-plus-aosp * commit '2e2465497c08061cccf4908e49095f2d19a35eea': Add better debug output for ResourceType errors