Fix flakiness of compositeDeadline check of eglGetFrameTimestsmps am: 40fd86f16f
authorBrian Anderson <brianderson@google.com>
Wed, 8 Mar 2017 23:57:30 +0000 (23:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 23:57:30 +0000 (23:57 +0000)
am: 7cc41a5dfc

Change-Id: Ib52a38e00b1edbcdb2bbd209ef87dc50a875a42b


Trivial merge