Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b

author Marco Nelissen <marcone@google.com>

Wed, 13 Sep 2017 20:36:28 +0000 (20:36 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 13 Sep 2017 20:36:28 +0000 (20:36 +0000)
author Marco Nelissen <marcone@google.com>
Wed, 13 Sep 2017 20:36:28 +0000 (20:36 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 13 Sep 2017 20:36:28 +0000 (20:36 +0000)
diff --cc media/libstagefright/MPEG4Extractor.cpp
Simple merge
author	Marco Nelissen <marcone@google.com>
	Wed, 13 Sep 2017 20:36:28 +0000 (20:36 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 13 Sep 2017 20:36:28 +0000 (20:36 +0000)