| commit | d3e10a9724e05f64152de6a6aa42c7b2a1abfa5b | [log] [tgz] |
|---|---|---|
| author | Dave Borowitz <dborowitz@google.com> | Mon Apr 14 12:10:11 2014 -0700 |
| committer | Dave Borowitz <dborowitz@google.com> | Mon Apr 14 12:10:34 2014 -0700 |
| tree | 7bf7b92dbbbac5de1a3328edcc0ad3b61fa5a714 | |
| parent | e6de7b9564d74890eff8045d3ee043a60587bac2 [diff] | |
| parent | 953784a50f8fda949eb0d1d035fa0d5f4d8ef77e [diff] |
Merge branch 'stable-2.8' into stable-2.9 * stable-2.8: Ensure NrtFutures are notified promptly of new search generation Fix deadlocks in SubIndex shutdown Change-Id: I723fb1cab17e57eb8714f9fa6c2f62b0c2d62a72