| commit | 7506dc2633853c56b46ee3f500358ac0e2280f2d | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Fri Feb 19 09:32:40 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 19 09:32:40 2010 -0800 |
| tree | e5cac38d3f9393e9d14ab5e56e66c83edcfb0378 | |
| parent | 3a928e46bdea32160c6cbecacdb2160389943a64 [diff] | |
| parent | 4baee90d22f02b1f31dcc7bca3bb9ad7263539ad [diff] |
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.