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

* commit '724ff2980d429e62557df73d588be2d678175716':
main
Jean Chalard 2013-04-03 19:28:13 -07:00 committed by Android Git Automerger
commit dee08de2c5

Diff Content Not Available