am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: 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 'b2af86cf0af6ca95378c616c857b7cab1de15dfc':
main
Jean Chalard 2013-04-17 19:49:43 -07:00 committed by Android Git Automerger
commit c825c55779

Diff Content Not Available