OSDN Git Service

Merge "Possibly fix deadlock." into nyc-dev
authorJulia Reynolds <juliacr@google.com>
Fri, 12 Feb 2016 19:00:42 +0000 (19:00 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Feb 2016 19:00:43 +0000 (19:00 +0000)

Trivial merge