am 6022a978: Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread

Merge commit '6022a9786f745dc41f92e71e16b5b95a7cfd81b7' into gingerbread-plus-aosp

* commit '6022a9786f745dc41f92e71e16b5b95a7cfd81b7':
  DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.