Merge "Update character limits in Phone settings"
Yorke Lee [Thu, 20 Jun 2013 21:51:18 +0000 (21:51 +0000)]

Trivial merge