tree 7eae9db3a5019f19e9d94cd84cd6b1a611f4f153
parent f161663814f4c372a8fa815dc787f18b09c66938
parent 42ee0a2a48f87922dc98f93abbe3394750b9c3f7
author Joe Onorato <joeo@android.com> 1283285576 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283285576 -0700

am 42ee0a2a: (-s ours) am cd7c775e: fix the build still

Merge commit '42ee0a2a48f87922dc98f93abbe3394750b9c3f7'

* commit '42ee0a2a48f87922dc98f93abbe3394750b9c3f7':
  fix the build still