tree 598c0c61ddc700b37ab4005ced25f71a3cc95494
parent 0bfcf0fa66623ce64d2cf3e0d7394a9fd8440360
parent 7b1b56503eec00729b39a331e7166af572e2ad64
author Pablo Ceballos <pceballos@google.com> 1468527116 +0000
committer android-build-merger <android-build-merger@google.com> 1468527116 +0000

Merge \\"Disable support for EGL_ANDROID_get_frame_timestamps\\" into nyc-mr1-dev am: 3e42f7f817
am: 7b1b56503e

Change-Id: I20e5c37e48820ab870abb3b341aca4ef53cdb5fc