tree cbd66b3cfd1304dd38624ea5418a7164dd3bf64b
parent 0a7b9973f7d208fd80adfe557a617757b9d5f610
parent 31234d811dc69c159757a6890852eb0f53d559a9
author Michael Jurka <mikejurka@google.com> 1320967196 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320967196 +0000

am 31234d81: fix build

* commit '31234d811dc69c159757a6890852eb0f53d559a9':
  fix build