tree 034af24412f8db212254129fe0bcd6699aa71dd4
parent dc47c05aaedc176b3e0bea62f05c47ee103970dc
parent cd7a9917db9ad4a4f56cca5153ea2a7b8fecfde9
author Andrew Hsieh <andrewhsieh@google.com> 1351724614 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351724614 -0700

am cd7a9917: Merge "Fix build with GCC 4.7"

* commit 'cd7a9917db9ad4a4f56cca5153ea2a7b8fecfde9':
  Fix build with GCC 4.7