tree e5cac38d3f9393e9d14ab5e56e66c83edcfb0378
parent 3a928e46bdea32160c6cbecacdb2160389943a64
parent 4baee90d22f02b1f31dcc7bca3bb9ad7263539ad
author Wink Saville <wink@google.com> 1266600760 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266600760 -0800

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.