Skip to content
Commit 7c0de1b4 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add pause and resume recoding APIs" am: abf0168d... 

[automerger skipped] Merge "Add pause and resume recoding APIs" am: abf0168d am: 094ad6ee am: b4cd332d -s ours

am skip reason: Change-Id Ib11ae5d3eddcd01dbd48efa58fb2d4011040b210 with SHA-1 d22f674d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498597

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cd49885197d725b3269dcd46812b3ca3ca86f86
parents 3becaf0e b4cd332d
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