tree 398e5e6f9f988d0350b4637647620cc40183fbf2
parent 27a17103f99d23157ac80ef7d75e25a3aae788bd
parent 29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1
author Mark Salyzyn <salyzyn@google.com> 1397499108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397499108 +0000

am 29fe1ea4: am 9829344d: Merge "media: memset sizeof argument issues"

* commit '29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1':
  media: memset sizeof argument issues