am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"

* commit '2cb50a05cd1d35a422666b6893a2a77c69c1b700':
main
Jean Chalard 2013-04-10 19:34:30 -07:00 committed by Android Git Automerger
commit 9f9050d18f

Diff Content Not Available