| commit | d2c6b664dcd3467a64d5e0b742146af6046a7df2 | [log] [tgz] |
|---|---|---|
| author | Dave Borowitz <dborowitz@google.com> | Mon Apr 14 12:10:59 2014 -0700 |
| committer | Dave Borowitz <dborowitz@google.com> | Mon Apr 14 12:11:12 2014 -0700 |
| tree | 6b292c44de58333bb13032661613a09ace391576 | |
| parent | 2758c69115e5f0a4729f423a3ee3f7b7ab0b82e9 [diff] | |
| parent | d3e10a9724e05f64152de6a6aa42c7b2a1abfa5b [diff] |
Merge branch 'stable-2.9' * stable-2.9: Ensure NrtFutures are notified promptly of new search generation Fix deadlocks in SubIndex shutdown Change-Id: I0dd60f02c6ee37938eb8d36f61c02a7ffe34ca88