tree 39039a3156e7e44297c5c6159138c5890ae5a756
parent 6d4d879037a495f9a4276a6996d1845594ce9090
parent d0f5664abb5a8d94ae13f63a5f3491b47383ee2f
author Andreas Huber <andih@google.com> 1375977397 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375977397 -0700

am d0f5664a: Merge "Handle undefined NAL type for h264 streaming"

* commit 'd0f5664abb5a8d94ae13f63a5f3491b47383ee2f':
  Handle undefined NAL type for h264 streaming