tree 3afa17a64581c4f6d7cb596fcae18b2bf7c3d029
parent 72150be44131de35e93cd24435eac71ff63be750
parent fe2bfd392c7d7092ed5fddb93974787e95f93326
author Marco Nelissen <marcone@google.com> 1440112540 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440112540 +0000

am fe2bfd39: Merge "Decoder: Reduced memory requirements"

* commit 'fe2bfd392c7d7092ed5fddb93974787e95f93326':
  Decoder: Reduced memory requirements