tree 2474ad395809724046ba5ab124a0dd62fab8e066
parent 2143ade8030b8765e8744f5ff1ad90343f7fbfcd
parent b6264a8795ed9469c80727123e3cafda1b07eda3
author Chung-yih Wang <cywang@google.com> 1283749298 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283749298 -0700

am b6264a87: Fix the build.

Merge commit 'b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp

* commit 'b6264a8795ed9469c80727123e3cafda1b07eda3':
  Fix the build.