OSDN Git Service

Merge "Fix build."
authorRobert Greenwalt <rgreenwalt@google.com>
Thu, 7 Apr 2011 23:01:46 +0000 (16:01 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 7 Apr 2011 23:01:46 +0000 (16:01 -0700)
commit8ffe69fbdad9da19133c7cfde1b49616a5cb5817
tree6446fdfd35230a7bd1987c3681f0f6b09751d380
parentaa22430ee351e2c69e9b06157a617978d9cc9967
parent69ece6c6d689bc6e154fae12e835410757024c87
Merge "Fix build."