tree 23f38bfe3176b1ffe1ad1aea278fa75221db4695
parent 4e38fa31abc95e606865e693b1be6180616a4be8
parent 9099343896ff1a1f2444cba372aaab4a0dbb4818
author Andreas Huber <andih@google.com> 1295981798 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295981798 -0800

am a79ec961: (-s ours) am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder

* commit 'a79ec961af59ad754cc338a1d3579f9940246b6f':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder