am 4844b206: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Browse Source

* commit '4844b2068d9f036f9f036da58f2295927c8ee085':
  Camera2: Use lower resolutions for front fake camera
  Camera2: Fix deadlock issues with getInProgressCount
  EmulatedFakeCamera2: Add features needed for recording support for 320x240, NV21
  gralloc: Add automatic format selection

...

This commit is contained in:

The Android Open Source Project

2012-11-06 11:22:52 -08:00

committed by Android Git Automerger

parent 15920fa945 4844b2068d

commit 413b280dcb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available