OSDN Git Service

Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd...
authorRobert Shih <robertshih@google.com>
Sat, 6 Sep 2014 00:49:52 +0000 (00:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 6 Sep 2014 00:49:53 +0000 (00:49 +0000)

Trivial merge