Tomdroid

Merge proposals dependent on lp://qastaging/~salgado/tomdroid/two-way-sync-ignoring-templates

  1. two-way-sync-ignoring-templates
  2. Dependent merge proposals

lp://qastaging/~salgado/tomdroid/two-way-sync-ignoring-templates has no merge proposals.