Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread