Danielle Millett 2931d8ace9 Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1

2012-01-12 07:28:24 -08:00

..

android

Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1

2012-01-12 07:28:24 -08:00

google/android

Convert content type "image/jpg" to "image/jpeg".

2011-09-30 15:26:34 +08:00