Merge changes I219c287b,I6adee670
authorAlex Converse <aconverse@google.com>
Thu, 5 Mar 2015 22:43:42 +0000 (14:43 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 5 Mar 2015 22:43:42 +0000 (14:43 -0800)
* changes:
  Call encoder control before running ethread test.
  Don't copy thread data for the main thread.


Trivial merge