tree 54c70bc5aa6b97ee3317c68056eefd526d8d2257
parent c8050f8dd7dcfe97d2a61b5bcabe5a76a84a8123
parent c4ca420625183a8efa619e06287b47f3d2e72283
author Dave Sparks <davidsparks@android.com> 1247503519 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1247503519 -0700

am c4ca4206: Fix build

Merge commit 'c4ca420625183a8efa619e06287b47f3d2e72283'

* commit 'c4ca420625183a8efa619e06287b47f3d2e72283':
  Fix build