tree d87ababfe56c32bf76b6e412ef9499c02b27cb4f
parent 538c168b3001a28b6538c7ac790ada65e5c3dcd4
parent 55a72ba8eb43cd4423dff606cb8aefc3a1a23aa4
author Dianne Hackborn <hackbod@google.com> 1245166625 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1245166625 -0700

am 4ebd855b: Fix build.

Merge commit '4ebd855bb7362d45833dc811f2622fcc788dec17'

* commit '4ebd855bb7362d45833dc811f2622fcc788dec17':
  Fix build.