| commit | 18a635c2a1ed198f9bc3b2a251c86d153aa8832a | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Wed Dec 10 21:32:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 21:32:45 2014 +0000 |
| tree | 1753ba70a409984c89735d989528caf349a1ece4 | |
| parent | f16df1f34dd51e6b67d715e5688a6d1701a3a0ee [diff] | |
| parent | 584674c39dad11be182ea3763df557d35554157b [diff] |
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.