OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 18:36:35 +0000 (11:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Jun 2010 18:36:35 +0000 (11:36 -0700)
commitd398e7a4932acbc317483fdfdf362838c5a3b52a
treefec5849cb7d7d03751602211254c47bb94188e1d
parent6be61854b10d0b47920a7d99ff8e94560dec3734
parent893e2b626f36bcc76cafd0848640ad83487c4a43
merge from open-source master

Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
media/java/android/media/MediaScanner.java