tree aba4958ef1710931351a32af49b6e198f89c84a0
parent d32d30119bd0c0988a6806f1205db5426235af52
parent 8c9eacd9b9669642b052e3349d55c6a303f54b31
author Joe Onorato <joeo@google.com> 1284654476 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284654476 -0700

am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread

Merge commit '8c9eacd9b9669642b052e3349d55c6a303f54b31' into gingerbread-plus-aosp

* commit '8c9eacd9b9669642b052e3349d55c6a303f54b31':
  DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.