OSDN Git Service

am 7193731a: Merge "Workaround g++ 4.7 compfail"
authorElliott Hughes <enh@google.com>
Thu, 25 Oct 2012 22:20:29 +0000 (15:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Oct 2012 22:20:29 +0000 (15:20 -0700)
* commit '7193731ae6b8083bc7a5e5e468fb98b1dbcf3f3d':
  Workaround g++ 4.7 compfail


Trivial merge