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

* commit '165f1f75d7ccc2c6c6f38980aec652aba60665dc':
  Add basic WSI rendering test

Change-Id: I74574a4c1ae320272591b79b3c9402245c8edebe


Trivial merge