am 7665e4ff: Workaround for GCC internal compiler error.
authorJarkko Pöyry <jpoyry@google.com>
Wed, 29 Oct 2014 23:08:22 +0000 (23:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 23:08:22 +0000 (23:08 +0000)
* commit '7665e4ff5452f9fc261434f98484728a233ef452':
  Workaround for GCC internal compiler error.


Trivial merge