| commit | 6b641a30df5a131978ac179bf7142c8b0a14913b | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Feb 17 12:51:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 17 12:51:50 2014 +0000 |
| tree | e7851861c32987147bfa2ddcbf9573b088f77f84 | |
| parent | 5b9174f3a4621a890c48ea4f29e2081409839e80 [diff] | |
| parent | f1c2687bdfe07d604da2c8d24365f8b055a91855 [diff] |
am f1c2687b: (-s ours) am 2893f4c0: Merge "Fix up android.core CTS tests." * commit 'f1c2687bdfe07d604da2c8d24365f8b055a91855': Fix up android.core CTS tests.