tree ba75d082ecbed45edad32b8dc5c930ff9620dd63
parent 232a09e7350c8032ee8eeff6293eacb9bfa3a322
parent a58452270b3584cddc418cf9de874b9e2f91c3fe
author Christopher Tate <ctate@google.com> 1280437080 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280437080 -0700

am 571180c4: Merge "Attempt to fix the SDK build" into gingerbread

Merge commit '571180c4c72e0bb4f930f8971edf000a652f10f6' into gingerbread-plus-aosp

* commit '571180c4c72e0bb4f930f8971edf000a652f10f6':
  Attempt to fix the SDK build