Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit da8a81dc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes If460a6ef,Ifabff1c2 

* changes:
  Rename SurfaceMediaSource::dump to dumpState
  HACK: work around both android-base/logging.h and ADebug.h defining CHECK
parents 8025cd5d f461f38e
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