tree 8bdcc7f8cf28351b11290878ea193f88a197c3d5
parent 46733267cd6323c6022fa79cae2dedea80989f21
parent 5238c5f9a55ae1fff3548c028003e47ab8ffe09c
author Joe Onorato <joeo@android.com> 1283286550 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283286550 -0700

am 5238c5f9: fix the build.  will revisit this change in a minute

Merge commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c'

* commit '5238c5f9a55ae1fff3548c028003e47ab8ffe09c':
  fix the build.  will revisit this change in a minute