am 808c739a: Merge change 23402 into eclair

Merge commit '808c739a9428b11a811659403bbb46a0814a2928' into eclair-plus-aosp

* commit '808c739a9428b11a811659403bbb46a0814a2928':
  Fix 2081525: NPE in MediaScannerService.

media/java/android/media/ExifInterface.java

@@ -340,6 +340,7 @@ public class ExifInterface {
         ParsePosition pos = new ParsePosition(0);
         try {
             Date date = sFormatter.parse(dateTimeString, pos);
+            if (date == null) return -1;
             return date.getTime();
         } catch (IllegalArgumentException ex) {
             return -1;