| commit | 37db3f9784eb05f21c1f230e540bebf46748139a | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Wed May 04 12:47:18 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 04 12:47:18 2011 -0700 |
| tree | 26b259e6c7be68626372782b48ac15a168ff75f6 | |
| parent | 60e3d60c5d80e77748f0e0ca8a32aa1a944f2a42 [diff] | |
| parent | 04c7502a33c1f4671dc7ee0ad53ef7951398a2ea [diff] |
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