tree ab0ec2bc9d830d0fd0f4f6330da59d4d1a7e5d8f
parent 54ee513885915f4e91588bbbaacf7409bf324354
parent ee340fbccf7e480929dd410540b84d6b22e81fc3
author Jack Palevich <jackpal@google.com> 1364580595 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364580595 -0700

am ee340fbc: Merge "quake: Fix build with gcc 4.8"

* commit 'ee340fbccf7e480929dd410540b84d6b22e81fc3':
  quake: Fix build with gcc 4.8