| commit | c31ec7125090e49396813b772860e1e0445279fa | [log] [tgz] |
|---|---|---|
| author | Lance Jin-woong Chang <jinwoong@google.com> | Fri Jun 26 05:38:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 05:38:43 2015 +0000 |
| tree | 3cd74a478b1629cb07a23d11270e17f6a2c46548 | |
| parent | d5a714963cbecf25808cfefa09b3d3552e2b333a [diff] | |
| parent | 42b4dd4d61773fbca1019ca3283070ac8a6e39e8 [diff] |
am 42b4dd4d: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 automerge: 809b7f9 * commit '42b4dd4d61773fbca1019ca3283070ac8a6e39e8': set delay during testPerformFiltering