Merge "Fix a few issues in synchronization tests" into nyc-dev
authorDavid Sodman <dsodman@google.com>
Thu, 14 Apr 2016 18:13:15 +0000 (18:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Apr 2016 18:13:15 +0000 (18:13 +0000)
am: 4dc29e7

* commit '4dc29e70d174f1c0071fc85ef57879f79886d325':
  Fix a few issues in synchronization tests

Change-Id: I69e5de12e29840d406b0527e6ed2f6a16a78901e


Trivial merge