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

Skip to content
Commit 695d61ce authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by android-build-merger
Browse files

resolve merge conflicts of 2830b014 to nyc-dev am: 2a0a707a 

am: b9b36262

* commit 'b9b36262':
  Camera3Device: Validate template ID
parents 01655dfe b9b36262
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment