OSDN Git Service

am 9ee39758: (-s ours) am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some...
authorMathias Agopian <mathias@google.com>
Tue, 14 Jun 2011 22:22:12 +0000 (15:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jun 2011 22:22:12 +0000 (15:22 -0700)
* commit '9ee3975883cc4356d7b44f4e86d8c61589d2f42c':
  DO NOT MERGE. may fix build on some version of gcc


Trivial merge