commit | 584674c39dad11be182ea3763df557d35554157b | [log] [tgz] |
---|---|---|
author | Michael Wright <michaelwr@google.com> | Wed Dec 10 00:01:23 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Dec 10 00:01:23 2014 +0000 |
tree | 8ac20cdc4609c5a77c3ae85041b6049dbe70325d | |
parent | 236dc2c81d9bb2a38b29dd1a4c7e23be25290ef2 [diff] | |
parent | 422db53f8cf2fc69cdf892cb42f33021f510f207 [diff] |
am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev automerge: 422db53 * commit '422db53f8cf2fc69cdf892cb42f33021f510f207': Don't try to scale the bitmaps for null MediaMetadata.