Commits
Michael Wright authored and Android Git Automerger committed 18a635c2a1eM
am 584674c3: am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev automerge: 422db53 * commit '584674c39dad11be182ea3763df557d35554157b': Don't try to scale the bitmaps for null MediaMetadata.
Showing diff to584674c39da