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

Skip to content
Commit 6db036de authored by Dan Egnor's avatar Dan Egnor Committed by Android Git Automerger
Browse files

am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to... 

am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread

Merge commit '79102ad0f56135335bccc935bbaeb4c5d8115214'

* commit '79102ad0f56135335bccc935bbaeb4c5d8115214':
  COMMENT-ONLY change to clarify Camera documentation.
parents 2912d5e0 0dda53db
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