| commit | 8cb5645a4e158a09d2f9daa77a67ea81fc63bfbd | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Mon Aug 22 21:38:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 22 21:38:36 2016 +0000 |
| tree | 9070a42493f5a15144220d7c53c228b4d67f774c | |
| parent | a49721050d2e2a532aa19283f94e889e0c138bc6 [diff] | |
| parent | 6fcd0081eb54d1f54fb9c148f08c67c7286b86b2 [diff] |
Merge "Fix a deadlock in service discovery callbacks" am: 6fcd0081eb Change-Id: I6e343bbc3ef5c54e372687ee989e1baa133a01c8