OSDN Git Service

am 61f23925: (-s ours) am 6022a978: Merge "DO NOT MERGE - These errors were missing...
authorJoe Onorato <joeo@google.com>
Thu, 16 Sep 2010 18:35:31 +0000 (11:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Sep 2010 18:35:31 +0000 (11:35 -0700)
commit66af7dd6c71e9d489f826ae4ab68f41a7c43c0c9
treec3822712a7cda521ec63141435202b5b20c07bb0
parentb66846947c2f74b2ba3eb3438eb49d23a2d5242a
parent61f23925d2d0b27ad5a62587c0f9d5e4a6040acc
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.