| commit | 74584744e8bb0b8a39ca000f369a31994bce5148 | [log] [tgz] |
|---|---|---|
| author | Lance Jin-woong Chang <jinwoong@google.com> | Fri Jun 26 06:30:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 06:30:06 2015 +0000 |
| tree | 1051897f81b6edfdcb4d3cdf288409de085aa3a0 | |
| parent | 2bb92dc73694ba2704adbbf0dba5c25f6edbe413 [diff] | |
| parent | b954a438100b556be2628c21a27e4ab88dc9068a [diff] |
am b954a438: am 110404d3: am 6ed9a0ef: am c31ec712: am 42b4dd4d: Merge "set delay during testPerformFiltering" into kitkat-cts-dev automerge: 73965a8 automerge: 809b7f9 * commit 'b954a438100b556be2628c21a27e4ab88dc9068a': set delay during testPerformFiltering