tree 6da6eb26a1a5683473967f4b11dce6e14e1010d0
parent ccee3363e385863de49e1b48a0ab191c94a7b433
parent a704eda0078989a73cac111ed309aca50d2e289b
author Mathieu Chartier <mathieuc@google.com> 1469729576 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1469729576 +0000

Merge "Use try lock to fix class resolution race"