tree c81cea214934a4d2c01be53bb686bd8c2994de94
parent 985a59a2deb69359d75211f1e197956b429dee69
parent 152503b31ee315fb89e8ab8e47c33276fbd32dea
author Dianne Hackborn <hackbod@google.com> 1242834875 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1242834875 -0700

am b2d41569: Fix build.

Merge commit 'b2d415693482f58e104a99376cc4f65bf3799edf'

* commit 'b2d415693482f58e104a99376cc4f65bf3799edf':
  Fix build.