Merge "Merging error-resilient example into simple_encoder."
authorDmitry Kovalev <dkovalev@google.com>
Mon, 3 Mar 2014 20:10:37 +0000 (12:10 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 3 Mar 2014 20:10:37 +0000 (12:10 -0800)
1  2 
examples.mk

diff --cc examples.mk
Simple merge