tree a18200e6e2ecad72de2e2c11bda5b5fa234fe81d
parent 52ba4faf2ed27cedd8779b148656f674adca19f7
parent 8a56bb70c736245e875635d3093d70a51394dea5
author Dan Stoza <stoza@google.com> 1461106267 +0000
committer android-build-merger <android-build-merger@google.com> 1461106267 +0000

Merge "DispSync: Actually wait forever" into nyc-dev
am: 8a56bb7

* commit '8a56bb70c736245e875635d3093d70a51394dea5':
  DispSync: Actually wait forever

Change-Id: I9e0a1c2420b6d8924f148d2acac92cffe7f5acec