tree 3cf05abf3a9008071ba83ad2a3987a69b04387aa
parent b04bbe15df0d40ae5d305f3b565cbac89c08a702
parent 2fbf24446ef97345a49fbd3063c4210685ec22c9
author Wei Jia <wjia@google.com> 1492816366 +0000
committer android-build-merger <android-build-merger@google.com> 1492816366 +0000

Merge "NuPlayerDecoder: check mCodec before dereferencing it." into oc-dev am: c84e294c4b
am: 2fbf24446e

Change-Id: I679afd7e4efa037bec61586ec2253a7e2daed26c