Change 31752
In dev_rebrand, bringing in changes from dev_c2s ala:
p4 merge --from dev_c2s
p4 resolve -am
No interactive resolve was needed.
p4 merge --from dev_c2s
p4 resolve -am
No interactive resolve was needed.
Tip: Use n and p to cycle through the changes.