OSDN Git Service

am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge...
authorNick Kralevich <nnk@google.com>
Tue, 11 Aug 2015 05:25:13 +0000 (05:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Aug 2015 05:25:13 +0000 (05:25 +0000)
commitf86b266c14d61887b91ba4cfd5e9531877ee455a
tree2318cdcbf017510f913834c22623a7a6a7878f57
parent74cda34ac909eb713cec22bebb08ecaeefd8f7dd
parent2c181bec9c781e7e50d99fb4e3b981b3d0a756f3
am 2c181bec: am 7f6a36d2: am b6131acd: am 94f8150b: resolved conflicts for merge of c86eae32 to klp-modular-dev

* commit '2c181bec9c781e7e50d99fb4e3b981b3d0a756f3':
  MPEG4Extractor.cpp: Add check for size == SIZE_MAX