tree 136a96a100553caae01ff3d0412d93a85b73629c
parent 30fedaeab934a7eac471b7a9e786043bfcd43cb1
parent e6eb0085f1b6f32d4a9f7b75c0002e48c35d4eb1
author Andrew Hsieh <andrewhsieh@google.com> 1356716917 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356716917 -0800

am e6eb0085: Merge "Fix compilation with clang and GCC 4.7"

* commit 'e6eb0085f1b6f32d4a9f7b75c0002e48c35d4eb1':
  Fix compilation with clang and GCC 4.7