| commit | 422db53f8cf2fc69cdf892cb42f33021f510f207 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Tue Dec 09 23:44:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 23:44:00 2014 +0000 |
| tree | 54607d2918c6f5baf62323db9d5edeb6413efc1b | |
| parent | 8650c358fb44b943dd74751742333bf1cebf7b8e [diff] | |
| parent | c6de3212c2dd8638bf3150719ed331673fdcab06 [diff] |
am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev * commit 'c6de3212c2dd8638bf3150719ed331673fdcab06': Don't try to scale the bitmaps for null MediaMetadata.