tree 988b1fe5710ef2943ba9a197e6ecc0e2caff0edd
parent 79039b2300767b0c56e1394da060ab0c2d2987d8
parent fc997d2d3a50b6cf970ad5dfe5de0a115b86c1fc
author John Reck <jreck@google.com> 1569515511 -0700
committer android-build-merger <android-build-merger@google.com> 1569515511 -0700

[automerger skipped] Merge "Increase dequeueBuffer timeout" am: 6e1e6fd699 -s ours am: 9b02158c76 -s ours
am: fc997d2d3a -s ours
am skip reason: change_id Ic4fae04b41f71600479f9557e334f67c27851db4 with SHA1 3f333d6d72 is in history

Change-Id: I40a0d1e8d1c8dd69737f0840d5aa0e93bcdc0c90