OSDN Git Service

Merge "This should fix the build."
authorJeff Hamilton <jham@google.com>
Thu, 4 Feb 2010 05:36:48 +0000 (21:36 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 4 Feb 2010 05:36:48 +0000 (21:36 -0800)
commit1298bfc6a4ab566d7fae2596a0ae73d082ef6da3
tree5e020733a5a8fce5d5aea1f298231357643ae66d
parent82c1baa16a66eabdd7fd1eb6569e61cb6caac4fd
parent4db482f37c2d246c0fdc6a64b4320a04229e2c09
Merge "This should fix the build."