tree da8f53e655a234a9666bd95975d8a008f10319eb
parent 904a4b7aaf270d4e58cb3bbb877a63559c760ee7
parent 4ee936667181975cd755acd81c653ba686d6106d
author Dianne Hackborn <hackbod@google.com> 1258661233 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258661233 -0800

am 4ee93666: am e4260f4e: Fix build.

Merge commit '4ee936667181975cd755acd81c653ba686d6106d' into eclair-mr2-plus-aosp

* commit '4ee936667181975cd755acd81c653ba686d6106d':
  Fix build.