Merge "eglGetFrameTimestamps: Allow reads done to equal rendering complete." am:...
authorBrian Anderson <brianderson@google.com>
Wed, 18 Oct 2017 23:16:09 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Oct 2017 23:16:09 +0000 (23:16 +0000)
am: cd11988b12

Change-Id: I8a6be95d0fd32d8f37626a2daec942f0925f05ce


Trivial merge