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

Skip to content
Commit 2b79658d authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by android-build-merger
Browse files

resolve merge conflicts of 6e0c00ba to nyc-dev-plus-aosp 

am: 0492686c

* commit '0492686c':
  Camera: Clean up warnings and set -Werror
  Camera: Switch camera2 to auto-gen C++ binder interfaces
parents 1547303a 0492686c
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