From: John Reck <jreck@google.com>
Date: Thu, 26 Sep 2019 16:42:26 +0000 (-0700)
Subject: [automerger skipped] Merge "Increase dequeueBuffer timeout" am: 6e1e6fd699 -s ours... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=15c1ce9780553b71e1ec8817e9abc73bd16fd64c;p=android-x86%2Fframeworks-base.git

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

Change-Id: Id2a200da0049fba88a5ce3c8c6ed5383617cd4c6
---

15c1ce9780553b71e1ec8817e9abc73bd16fd64c