tree c3822712a7cda521ec63141435202b5b20c07bb0
parent b66846947c2f74b2ba3eb3438eb49d23a2d5242a
parent 61f23925d2d0b27ad5a62587c0f9d5e4a6040acc
author Joe Onorato <joeo@google.com> 1284662131 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284662131 -0700

am 61f23925: (-s ours) 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 '61f23925d2d0b27ad5a62587c0f9d5e4a6040acc'

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