Merge "Fix build on some linux machines"
authorJean-Baptiste Queru <jbq@google.com>
Wed, 11 Aug 2010 16:55:36 +0000 (09:55 -0700)
committerAndroid Code Review <code-review@android.com>
Wed, 11 Aug 2010 16:55:36 +0000 (09:55 -0700)
commite37ab63221af94d69437741a3645fc0e14a680bc
tree95b6c0da14880786952dbb82dba0ff575b38c139
parentc4c4c98c5ca6b4c017a5b429a6bd80a440c63559
parentb7ffaf6ae29f300c2d8e9c77e58710adfa388633
Merge "Fix build on some linux machines"