summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-05-04 12:47:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-04 12:47:18 -0700
commit37db3f9784eb05f21c1f230e540bebf46748139a (patch)
tree26b259e6c7be68626372782b48ac15a168ff75f6
parent60e3d60c5d80e77748f0e0ca8a32aa1a944f2a42 (diff)
parent04c7502a33c1f4671dc7ee0ad53ef7951398a2ea (diff)
downloadframeworks_av-37db3f9784eb05f21c1f230e540bebf46748139a.zip
frameworks_av-37db3f9784eb05f21c1f230e540bebf46748139a.tar.gz
frameworks_av-37db3f9784eb05f21c1f230e540bebf46748139a.tar.bz2
am 0faefb72: (-s ours) am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
* commit '0faefb72fb8917c9408f7b71c2bac5a9d5f264c2': DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
0 files changed, 0 insertions, 0 deletions