Merge "Fix several bugs in synchronization tests" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 14 Apr 2016 23:27:47 +0000 (23:27 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 Apr 2016 23:27:48 +0000 (23:27 +0000)

Trivial merge