OSDN Git Service

am 42ee0a2a: (-s ours) am cd7c775e: fix the build still
authorJoe Onorato <joeo@android.com>
Tue, 31 Aug 2010 20:12:56 +0000 (13:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Aug 2010 20:12:56 +0000 (13:12 -0700)
commit5645dc379a79e4d7b3248a7faa92edd6c2fae732
tree7eae9db3a5019f19e9d94cd84cd6b1a611f4f153
parentf161663814f4c372a8fa815dc787f18b09c66938
parent42ee0a2a48f87922dc98f93abbe3394750b9c3f7
am 42ee0a2a: (-s ours) am cd7c775e: fix the build still

Merge commit '42ee0a2a48f87922dc98f93abbe3394750b9c3f7'

* commit '42ee0a2a48f87922dc98f93abbe3394750b9c3f7':
  fix the build still