OSDN Git Service

resolve merge conflicts of 98b6aad to nyc-mr1-dev-plus-aosp
authorSami Tolvanen <samitolvanen@google.com>
Tue, 7 Jun 2016 00:53:02 +0000 (17:53 -0700)
committerSami Tolvanen <samitolvanen@google.com>
Tue, 7 Jun 2016 00:53:02 +0000 (17:53 -0700)
commit5178babfe3f184be85f2657367b82c06337ce8bf
tree117a94a8c7eb8d8212ba814a869d523a7dd1323c
parent491f85fcfdab613e4c76460c6781ab01a34d41f5
parent98b6aada664e8f9338cc031f0e51f8fd135ad5e5
resolve merge conflicts of 98b6aad to nyc-mr1-dev-plus-aosp

Change-Id: If7685b0ed4a5c1cb01f6864fa6c5dcad91898bf0
libfec/fec_private.h
libfec/include/fec/io.h