Jim Miller 270826a887 Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1

2011-11-09 15:19:31 -08:00

..

android

Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1

2011-11-09 15:19:31 -08:00

google/android

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

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