| commit | 6d0be31ff27e5ff94a55b8665ed91a402d34c3bf | [log] [tgz] |
|---|---|---|
| author | Christoph Studer <chstuder@google.com> | Thu Sep 25 16:24:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 25 16:24:22 2014 +0000 |
| tree | 4e26061b5a4780be3be02c4c1d6f476361b54fbf | |
| parent | 2a7667de96ecda1903a38449f1a28f8ce7e4adeb [diff] | |
| parent | e1b032a84086a5d6f36b6910171110543224bdf5 [diff] |
am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev * commit '78205c2b2e4f28cdafff93be2c599097b1b9f00d': NoMan: Add 3s timeout in matchesCallFilter()