tree 391e0366b1fbb17d064315a268c447e538049c16
parent 42dfd8c4509105b0b810b3841b2f79a4cb726e62
parent 758de4045b2cb760c13e74758e7298a415964ee0
author Brett Chabot <brettchabot@google.com> 1250617151 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250617151 -0700

am 758de404: Remove emma from test build to save space.

Merge commit '758de4045b2cb760c13e74758e7298a415964ee0' into eclair

* commit '758de4045b2cb760c13e74758e7298a415964ee0':
  Remove emma from test build to save space.