am f2b0ed6d: am 74712136: Merge "Fix helper_invocation.* rendering mostly black....
authorJarkko Pöyry <jpoyry@google.com>
Wed, 24 Jun 2015 22:53:09 +0000 (22:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Jun 2015 22:53:09 +0000 (22:53 +0000)
* commit 'f2b0ed6d7b6a0a4c633a22bc5f23340759c8827e':
  Fix helper_invocation.* rendering mostly black.


Trivial merge