| commit | acd574c1a7f3e8e79ab14aef942b896019349798 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Jun 01 21:16:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 21:16:40 2015 +0000 |
| tree | bbd125c166a7ab07f688eeaeb332809f66bd0ace | |
| parent | 5dd45034c3785792c59b3ef663ac2b669637d607 [diff] | |
| parent | 7a67c3359dec33f6287d6fb061ec95a0c5220c63 [diff] |
am 7a67c335: Merge "Modify the code to avoid potential deadlocks." * commit '7a67c3359dec33f6287d6fb061ec95a0c5220c63': Modify the code to avoid potential deadlocks.