tree ae02eb2d6973fab40b882a714cfb2cc8e5c9b3c4
parent 6ed77203e83f7606c7512aa772e2652284cd231a
parent 4b31e195228adee768a0c98b7eb571f7761e016b
author Andreas Terzis <aterzis@google.com> 1526515135 -0700
committer android-build-merger <android-build-merger@google.com> 1526515135 -0700

Merge "Increase the char limit of carrier_and_update_now_text to 34." into pi-dev am: 6eb1d9ed90
am: 4b31e19522

Change-Id: I0be752cc63cf48b89faa94ce822374ac40a70f97