tree 89373fd5493208fc4fed44cf3ddce5aacee64bf9
parent ece9e1947831a46b5d67b1a3d3d8e0189e38d983
parent 2e2465497c08061cccf4908e49095f2d19a35eea
author Kenny Root <kroot@google.com> 1283467729 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283467729 -0700

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