am f8a93cb7: (-s ours) am 8c9eacd9: Merge "DO NOT MERGE. Use the new...
am f8a93cb7: (-s ours) am 8c9eacd9: Merge "DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags." into gingerbread
Merge commit 'f8a93cb7'
* commit 'f8a93cb7':
DO NOT MERGE. Use the new -knowntags option to suppress warnings for some known tags.