Merge "Merge branch 'campaigns'"

This commit is contained in:
Brion VIBBER 2013-10-18 18:07:21 +00:00 committed by Gerrit Code Review
commit 786e1eb580
32 changed files with 1374 additions and 462 deletions

View file

@ -138,4 +138,5 @@
<string name="detail_panel_cats_label">Categories</string>
<string name="detail_panel_cats_loading">Loading...</string>
<string name="detail_panel_cats_none">None selected</string>
<string name="provider_campaigns">Campaigns</string>
</resources>