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


Trivial merge