am 2f031d0d: am f2b0ed6d: am 74712136: Merge "Fix helper_invocation.* rendering mostl...
authorJarkko Pöyry <jpoyry@google.com>
Wed, 24 Jun 2015 23:08:28 +0000 (23:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Jun 2015 23:08:28 +0000 (23:08 +0000)
* commit '2f031d0d4de312d2aba9c139e50c732de1126941':
  Fix helper_invocation.* rendering mostly black.


Trivial merge