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)
commit2b92091f70dde6fb7ab3905322adb6ed3f13908d
tree82bfe4451fd7662597a0c5cd3f45be773fa67585
parentc22f4419d920e8d70f9c0a4f495016bb2de96297
parent78aa6fc409848f3ea9bab31a20ec8e36a969785b
Merge "Fix several bugs in synchronization tests" into nyc-dev am: 800605b
am: 78aa6fc

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

Change-Id: I7ebbf1ebeee32539a95493ce7e6e531198ab8b15