EGL_ANDROID_get_frame_timestamps fixes am: 679b3e921a
authorBrian Anderson <brianderson@google.com>
Thu, 13 Apr 2017 04:58:41 +0000 (04:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 04:58:41 +0000 (04:58 +0000)
am: 7f554ec88f

Change-Id: Ib13a6631a6c8a7c9a9f19c51198d25372d230f63


Trivial merge