Merge "Fix several bugs in synchronization tests" into nyc-dev am: 800605b
authorPyry Haulos <phaulos@google.com>
Thu, 14 Apr 2016 23:44:10 +0000 (23:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Apr 2016 23:44:10 +0000 (23:44 +0000)
am: 78aa6fc

* commit '78aa6fc409848f3ea9bab31a20ec8e36a969785b':
  Fix several bugs in synchronization tests

Change-Id: I7ebbf1ebeee32539a95493ce7e6e531198ab8b15


Trivial merge