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)
am: 800605b

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

Change-Id: I467265c06d3a38970cdcacc75977b463aa556fdf


Trivial merge