Merge "Fix several bugs in synchronization tests" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Thu, 14 Apr 2016 23:37:08 +0000 (23:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Apr 2016 23:37:08 +0000 (23:37 +0000)
commit78aa6fc409848f3ea9bab31a20ec8e36a969785b
tree82bfe4451fd7662597a0c5cd3f45be773fa67585
parent5b5493203f6b1d3965e7281d2ddc5daeb809f89e
parent800605b0799f676c971b42e87d826561d503336c
Merge "Fix several bugs in synchronization tests" into nyc-dev
am: 800605b

* commit '800605b0799f676c971b42e87d826561d503336c':
  Fix several bugs in synchronization tests

Change-Id: I467265c06d3a38970cdcacc75977b463aa556fdf