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

Commit 341ff136 authored by Dan Egnor's avatar Dan Egnor
Browse files

resolved conflicts for merge of 9bc4039a to gingerbread 

Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
parents cc14a839 9bc4039a

core/java/android/hardware/Camera.java

+315 −147

File changed.

Preview size limit exceeded, changes collapsed.