OSDN Git Service

am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
authorXavier Ducrohet <xav@android.com>
Wed, 27 Jul 2011 20:59:57 +0000 (13:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Jul 2011 20:59:57 +0000 (13:59 -0700)
commit4d21c7732c978a593dfa78f8da1fed7511b38e95
tree923fedb711db5824390f501569bc756bdb7caa45
parentb0878223db87700cdc988a6d9197ca4e3c4772db
parent4d1fa60bfe660fd0fc6671116da597c0027cbb16
am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"

* commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16':
  DO NOT MERGE. may fix build on some version of gcc