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)
commitfeda5d244cd5baf93575f7027b5a5c8b2ac09c2f
tree54ccd16eeec11626313f146d7f109e7778b4693e
parentb21e361f8d692f70d5398b068b86b6fdab2c5759
parent587a0b3ef9b191d294d2447a7a918d43bd082db4
Merge changes I219c287b,I6adee670

* changes:
  Call encoder control before running ethread test.
  Don't copy thread data for the main thread.