OSDN Git Service

Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
authorXavier Ducrohet <xav@google.com>
Wed, 29 Jun 2011 01:52:43 +0000 (18:52 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 29 Jun 2011 01:52:43 +0000 (18:52 -0700)
commit54146a634e0e66a5e4732ba1a80079a1e93bdd8a
tree05746b8db5d211a03ce519842e946a0a80d47035
parent2f9ad8b499cb150d5cdfe84a9795992c5dd42cff
parentec15afca08fcc342d6f22cf02a21975af13091cf
Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread