am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev

* commit '11b600b9091bc4d00f861d46c2ff95f2c2aa07d2':
  [DO NOT MERGE] Increase string limits
main
Jean Chalard 2013-03-27 21:12:25 -07:00 committed by Android Git Automerger
commit a050834cdc

Diff Content Not Available