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

* commit '6ce2dd1de2a452b53082293428a2f67e9f2ef0f4':
  Fix a few issues in synchronization tests

Change-Id: If6ae7c5fa3976a32d61b6c765c394ddea7c41999