Merge "Add basic WSI rendering test" into nyc-dev am: 165f1f7
authorPyry Haulos <phaulos@google.com>
Tue, 12 Apr 2016 02:04:47 +0000 (02:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Apr 2016 02:04:47 +0000 (02:04 +0000)
am: 29695f2

* commit '29695f2bd0ec331b8a8cd20255ddbede039a8c43':
  Add basic WSI rendering test

Change-Id: I258a3fb2ba08b00dae601e7dc6b3b71a91f2368c


Trivial merge