Merge changes I5f7e56e3,I7f88e1da into oreo-cts-dev
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 7 Nov 2017 19:49:35 +0000 (19:49 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 7 Nov 2017 19:49:35 +0000 (19:49 +0000)
* changes:
  eglGetFrameTimestamps: Consider timestamps of 0 as invalid.
  eglGetFrameTimestamps: Allow reads done to equal rendering complete.


Trivial merge