am 2e246549: Merge "Add better debug output for ResourceType errors" into gingerbread

Merge commit '2e2465497c08061cccf4908e49095f2d19a35eea' into gingerbread-plus-aosp

* commit '2e2465497c08061cccf4908e49095f2d19a35eea':
  Add better debug output for ResourceType errors