tree 1825b0366cbed4d5a74a80a4d4ef2ce140cc1d8c
parent 983be8ac0aeed98e7e9171c025e172ad88a513d0
parent cdda1cee561622d111b0c5d654003a296d1d2b7a
author Michael Jurka <mikejurka@google.com> 1296432705 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296432705 -0800

am cdda1cee: fix the build

* commit 'cdda1cee561622d111b0c5d654003a296d1d2b7a':
  fix the build