Change 32482
Merge down from //p4-sdp/dev -> //p4-sdp/dev_rebrand.
This was initiated with 'p4 merge' (no options).
The 'p4 resolve -as', 'p4 resolve -am' and several interactive resolves were done.
This was initiated with 'p4 merge' (no options).
The 'p4 resolve -as', 'p4 resolve -am' and several interactive resolves were done.
Tip: Use n and p to cycle through the changes.