am 2d3353be: am 04f4c51c: reconcile main tree with open-source eclair

Merge commit '2d3353be64c34a8ed7c0c75a739e48b517c361e6'

* commit '2d3353be64c34a8ed7c0c75a739e48b517c361e6':
  android-2.1_r1 snapshot
tree: 9f19f3657dfd2caae243c1eab470aefd3aac6ed5
  1. Android.mk
  2. ansi2knr.1
  3. ansi2knr.c
  4. cderror.h
  5. cdjpeg.c
  6. cdjpeg.h
  7. change.log
  8. cjpeg.1
  9. cjpeg.c
  10. ckconfig.c
  11. coderules.doc
  12. config.guess
  13. config.sub
  14. configure
  15. djpeg.1
  16. djpeg.c
  17. example.c
  18. filelist.doc
  19. install-sh
  20. install.doc
  21. jcapimin.c
  22. jcapistd.c
  23. jccoefct.c
  24. jccolor.c
  25. jcdctmgr.c
  26. jchuff.c
  27. jchuff.h
  28. jcinit.c
  29. jcmainct.c
  30. jcmarker.c
  31. jcmaster.c
  32. jcomapi.c
  33. jconfig.bcc
  34. jconfig.cfg
  35. jconfig.dj
  36. jconfig.doc
  37. jconfig.h
  38. jconfig.mac
  39. jconfig.manx
  40. jconfig.mc6
  41. jconfig.sas
  42. jconfig.st
  43. jconfig.vc
  44. jconfig.vms
  45. jconfig.wat
  46. jcparam.c
  47. jcphuff.c
  48. jcprepct.c
  49. jcsample.c
  50. jctrans.c
  51. jdapimin.c
  52. jdapistd.c
  53. jdatadst.c
  54. jdatasrc.c
  55. jdcoefct.c
  56. jdcolor.c
  57. jdct.h
  58. jddctmgr.c
  59. jdhuff.c
  60. jdhuff.h
  61. jdinput.c
  62. jdmainct.c
  63. jdmarker.c
  64. jdmaster.c
  65. jdmerge.c
  66. jdphuff.c
  67. jdpostct.c
  68. jdsample.c
  69. jdtrans.c
  70. jerror.c
  71. jerror.h
  72. jfdctflt.c
  73. jfdctfst.c
  74. jfdctint.c
  75. jidctflt.c
  76. jidctfst.c
  77. jidctfst.S
  78. jidctint.c
  79. jidctred.c
  80. jinclude.h
  81. jmem-android.c
  82. jmemansi.c
  83. jmemdos.c
  84. jmemdosa.asm
  85. jmemmac.c
  86. jmemmgr.c
  87. jmemname.c
  88. jmemnobs.c
  89. jmemsys.h
  90. jmorecfg.h
  91. jpegint.h
  92. jpeglib.h
  93. jpegtran.1
  94. jpegtran.c
  95. jquant1.c
  96. jquant2.c
  97. jutils.c
  98. jversion.h
  99. libjpeg.doc
  100. ltconfig
  101. ltmain.sh
  102. makcjpeg.st
  103. makdjpeg.st
  104. makeapps.ds
  105. makefile.ansi
  106. makefile.bcc
  107. makefile.cfg
  108. makefile.dj
  109. makefile.manx
  110. makefile.mc6
  111. makefile.mms
  112. makefile.sas
  113. makefile.unix
  114. makefile.vc
  115. makefile.vms
  116. makefile.wat
  117. makelib.ds
  118. makeproj.mac
  119. makljpeg.st
  120. maktjpeg.st
  121. makvms.opt
  122. MODULE_LICENSE_BSD_LIKE
  123. NOTICE
  124. rdbmp.c
  125. rdcolmap.c
  126. rdgif.c
  127. rdjpgcom.1
  128. rdjpgcom.c
  129. rdppm.c
  130. rdrle.c
  131. rdswitch.c
  132. rdtarga.c
  133. README
  134. structure.doc
  135. testimg.bmp
  136. testimg.jpg
  137. testimg.ppm
  138. testimgp.jpg
  139. testorig.jpg
  140. testprog.jpg
  141. transupp.c
  142. transupp.h
  143. usage.doc
  144. wizard.doc
  145. wrbmp.c
  146. wrgif.c
  147. wrjpgcom.1
  148. wrjpgcom.c
  149. wrppm.c
  150. wrrle.c
  151. wrtarga.c