| commit | c768cf7c97077ff6a8252de214dbb83002507cac | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Jun 01 21:08:35 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 01 21:08:36 2015 +0000 |
| tree | bbd125c166a7ab07f688eeaeb332809f66bd0ace | |
| parent | 31f45b2e6d4920308d2820e043455c241050ca33 [diff] | |
| parent | 0e367f1b6e59490ebeea84846e7010330d5a4823 [diff] |
Merge "Modify the code to avoid potential deadlocks."