am 1592f16d: Fix executor regression.
authorJarkko Pöyry <jpoyry@google.com>
Fri, 29 May 2015 22:14:24 +0000 (22:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 22:14:24 +0000 (22:14 +0000)
* commit '1592f16d1fc9edde443474e1835746f705ed79a9':
  Fix executor regression.


Trivial merge