Skip to content
Commit 9b02158c authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

[automerger skipped] Merge "Increase dequeueBuffer timeout" 

am: 6e1e6fd6 -s ours
am skip reason: change_id Ic4fae04b41f71600479f9557e334f67c27851db4 with SHA1 3f333d6d is in history

Change-Id: Id0fa243e39aabd45b31f8a3bfa40f9f4242ec2a6
parents 4791a511 6e1e6fd6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment