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)
commit6440e2955d401699389a5715eb067f59e85b6aac
treee0af263c0f2b4e37b164e10e29a3603e08b78287
parent07c4d2252b61198c1fbb6afac5630133ff73a61d
parent194e6f2983f02e50c0489dc50a8ec203e9433f3a
Merge "Merging error-resilient example into simple_encoder."
examples.mk