am fd1df7ea: Remove invalid assert from RenderActivity::setThread()
authorPyry Haulos <phaulos@google.com>
Thu, 23 Oct 2014 22:39:22 +0000 (22:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 22:39:22 +0000 (22:39 +0000)
* commit 'fd1df7eaea78d2c9c6bdb3da51d5f1255c479694':
  Remove invalid assert from RenderActivity::setThread()


Trivial merge