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

Commit 79102ad0 authored by Dan Egnor's avatar Dan Egnor Committed by Android Git Automerger
Browse files

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

Merge commit 'fb1c0fe7' into gingerbread-plus-aosp

* commit 'fb1c0fe7':
  COMMENT-ONLY change to clarify Camera documentation.
parents dd206093 fb1c0fe7

core/java/android/hardware/Camera.java

+315 −147

File changed.

Preview size limit exceeded, changes collapsed.