am 4baee90d: (-s ours) am 75dc3a9d: DO NOT MERGE; Add back support for uts testing.

Merge commit '4baee90d22f02b1f31dcc7bca3bb9ad7263539ad'

* commit '4baee90d22f02b1f31dcc7bca3bb9ad7263539ad':
  DO NOT MERGE; Add back support for uts testing.
This commit is contained in:
Wink Saville 2010-02-19 09:32:40 -08:00 committed by Android Git Automerger
commit 7506dc2633

Diff Content Not Available