OSDN Git Service

Merge "media: Fix a typo in parsing nclc atom." into nyc-dev am: 08ef71975b am: d6768...
authorMarco Nelissen <marcone@google.com>
Wed, 13 Sep 2017 22:28:23 +0000 (22:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Sep 2017 22:28:23 +0000 (22:28 +0000)
am: 04cb1d7f53

Change-Id: Ib2773de7e003ab14d18e5b8c8f70e4800e0cfc63


Trivial merge