Bring exynos5 current

Squashed commit of the following:

commit eed2342115e57f53f19e05411715a10573a5d74d
Merge: 320c939 363cef4
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Wed Jul 24 23:40:06 2013 +0100

    Merge tag 'android-4.3_r2.1' into cm-10.2

    Android 4.3 release 2.1

commit 363cef472e275f4900dc4916acd03718c7d57284
Merge: 05c0c1a f7fea75
Author: The Android Automerger <android-build@google.com>
Date:   Wed Jun 5 10:17:51 2013 -0700

    merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

commit 05c0c1a4b70392cf7a8a3fd7d12f99e597a3e996
Author: Alex Ray <aray@google.com>
Date:   Mon Jun 3 13:23:34 2013 -0700

    libcamera2: add hardwareLevel to camera metadata

    Technically, this is only required for v3 and higher devices, and this
    is a v2 device.  There aren't any other v2 devices, so our framework
    logic just treats them the same.  Adding this metadata entry puts this
    device back as a first-class full (v3) device in the framework.

    Bug: 9261359
    Change-Id: I4ba91c5689fd17d4a3f2044fae1c39dd9ee625df

commit f7fea7522d422105ad7cf75987b4927c055bd292
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Thu May 16 17:33:06 2013 -0700

    Camera: Fix green JPEGs

    Need crop regions to be 4 entries on the input and the output; otherwise
    the sanity checks when doing reprocessing will reject the HAL's own output.

    Bug: 8947463
    Change-Id: I0be0ac816cb65c802c3a5ae56af732edf9145edc

commit 39ed516364d4f0b2648113cb3f94533e86c2da95
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Thu May 16 17:33:06 2013 -0700

    Camera: Fix green JPEGs

    Need crop regions to be 4 entries on the input and the output; otherwise
    the sanity checks when doing reprocessing will reject the HAL's own output.

    Bug: 8947463
    Change-Id: I0be0ac816cb65c802c3a5ae56af732edf9145edc

commit d6a9771c65d06031c88f7514d1b71d4aaf35d78d
Merge: 25bee06 6a55c15
Author: The Android Automerger <android-build@google.com>
Date:   Thu May 16 05:55:38 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 25bee067b500484f8b0a1976da0ff672a7eb7e9e
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Wed May 15 12:42:08 2013 -0700

    exynos_omx: Increase number of video resources

    Bug: 8950258

    Change-Id: I497fe3c199298dba3c0932cd640b0d3b98417ded
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

commit 6a55c15fd683b6ccf55ad3cca4131e531554c164
Merge: 6a3cbca 122887f
Author: The Android Automerger <android-build@android.com>
Date:   Mon May 13 05:55:48 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 6a3cbcafbfceabad2711388f1e417982deaf5fdf
Merge: 7af1168 a40ca07
Author: Igor Murashkin <iam@google.com>
Date:   Thu May 9 19:01:23 2013 +0000

    Merge "camera: Use cropRegion as 4 parts instead of 3 parts" into jb-mr2-dev

commit a40ca07e12bb91f76cc5bb0ff6a723ea7b724eb8
Author: Igor Murashkin <iam@google.com>
Date:   Tue May 7 16:40:33 2013 -0700

    camera: Use cropRegion as 4 parts instead of 3 parts

    Bug: 8756080
    Change-Id: Id3dff232091f73e4ed143d2f0010451c3709fbcb

commit 122887fd04723b6cd95c33f20e13749b2625d598
Merge: 7af1168 115ce97
Author: The Android Automerger <android-build@android.com>
Date:   Mon May 6 05:55:39 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 7af1168953fa6aa5337de11fbf78d16fc6768834
Merge: 8f33812 a7fe049
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Thu May 2 16:15:54 2013 +0000

    Merge "Camera2: Adjust sensor dimensions for correct FOV." into jb-mr2-dev

commit 115ce976fc849983600736ede3006fc4ec271f68
Merge: 8f33812 b356402
Author: The Android Automerger <android-build@android.com>
Date:   Wed May 1 05:55:52 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit a7fe04979e0131722eb38bf47a42328b2ce976bb
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Tue Apr 30 13:32:53 2013 -0700

    Camera2: Adjust sensor dimensions for correct FOV.

    Bug: 8484377
    Change-Id: I22ddd62edddc2c9ba10cac35af083df14f0e8f9a

commit 8f33812f854fabb86b60074d956359d04473fb85
Author: Taehwan Kim <t_h.kim@samsung.com>
Date:   Tue Apr 30 09:10:08 2013 +0000

    exynos_omx: multi_thread: Support for testCreateInputSurfaceErrors Test.

    mediaserver crash is resolved.

    Bug: 8329017

    Change-Id: I6f6f160709e1e8be21a17bce2954a3e4a12d53a2
    Signed-off-by: Taehwan Kim <t_h.kim@samsung.com>

commit b3564027a10f410e69ac1c34a8d84bd3bbc9551d
Merge: 9449b16 09cd4aa
Author: The Android Automerger <android-build@android.com>
Date:   Tue Apr 30 05:56:09 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 9449b168e067934c54cd846f61791cc8e52cea22
Author: Dima Zavin <dima@android.com>
Date:   Sat Apr 27 00:05:57 2013 -0700

    keystore: don't use binder input buffers for rsa sign/verify directly

    The input buffers for RSA sign/verify are passed over the binder, which
    maps it into this process as read-only. When this buffer is passed
    to mobicore, it tries to pin the page with __get_user_pages with
    PROT_WRITE, which fails. Since the mobicore transport code doesn't
    know if the APIs are producers or consumers, it "rightfully" assumes
    all buffers are read/write. The interface to trustzone currently
    doesn't support specifying read/write access bits, so instead
    we create a copy of the input data in a locally allocated
    malloc buffer and use that instead.

    Bug: 8019596
    Change-Id: I3c77c893f674ec73196a8a2ea3e5a24fb9e3b860
    Signed-off-by: Dima Zavin <dima@android.com>

commit 09cd4aa84a30e838d10b6a83b29548e49a721c3c
Merge: 6568c0f 9d74e82
Author: The Android Automerger <android-build@android.com>
Date:   Thu Apr 18 05:55:48 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 320c939ef471644fcb618cd3b5688e68694170a9
Merge: 7219980 e1b99ca
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed Apr 17 21:43:17 2013 -0700

    Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/hardware/samsung_slsi/exynos5 into cm-10.1

    Android 4.2.2 release 1.2

    # gpg: Signature made Wed 17 Apr 2013 01:00:33 PM PDT using DSA key ID 9AB10E78
    # gpg: Can't check signature: public key not found

commit 6568c0f1e188d3470333e15cc157d7199117e664
Author: Alex Ray <aray@google.com>
Date:   Mon Apr 15 11:25:08 2013 -0700

    libcamera2: use chroma gralloc private usage flag

    Bug: 7985212
    Change-Id: Id3dd2617572f1cfb668407e4edf3feaeada0d6c9

commit 06f1fa77873867819b1a6c24ba3c9a088ec6360d
Author: Alex Ray <aray@google.com>
Date:   Mon Apr 15 11:24:13 2013 -0700

    gralloc: add private flag to indicate chroma space

    Bug: 7985212
    Change-Id: I1f1205040a72438246246775d57508af16ba1dbd

commit 9d74e8250a8eaab2eb46715ce880c909bb850e43
Merge: 27877c2 1983f27
Author: The Android Automerger <android-build@android.com>
Date:   Wed Apr 10 05:56:32 2013 -0700

    merge in jb-mr2-release history after reset to jb-mr2-dev

commit 27877c2ff75ec10b994f7e0cfdd5f1b82fc37201
Merge: 1264ab1 3c53312
Author: Ying Wang <wangying@google.com>
Date:   Wed Apr 10 05:20:15 2013 +0000

    Merge "Add liblog" into jb-mr2-dev

commit 3c53312a8770c1f7c2f226c7e64304749b721427
Author: Ying Wang <wangying@google.com>
Date:   Tue Apr 9 22:00:24 2013 -0700

    Add liblog

    Bug: 8580410
    Change-Id: I23c1f8541e7de016aa920d13dd35d9b5c7b7d1c8

commit 1983f27ff90e961073f08d9f51a969367f2b3606
Author: Alex Ray <aray@google.com>
Date:   Mon Apr 8 17:44:06 2013 -0700

    libcamera2: Protect in-flight counts.

    Protect numEntries accesses with numEntriesLock.
    Protect jpegEncoder accesses with jpegEncoderLock.

    Bug: 8058308
    Change-Id: Idc31172d7d154ae2051e9eab94dadcf8f6cdddd3

commit 1264ab1629accf444d13831e209eafe4657d7664
Author: Alex Ray <aray@google.com>
Date:   Mon Apr 8 17:44:06 2013 -0700

    libcamera2: Protect in-flight counts.

    Protect numEntries accesses with numEntriesLock.
    Protect jpegEncoder accesses with jpegEncoderLock.

    Bug: 8058308
    Change-Id: Idc31172d7d154ae2051e9eab94dadcf8f6cdddd3

commit d866f455acab131be8f058733abd9c1ede2fcfea
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Thu Apr 4 14:45:37 2013 +0900

    exynos_omx: multi_thread: Bug fix.

    wrong parameter fixed.

    Change-Id: If0750b5a669249824b12ac13fa447e2208acd798
    Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>

commit 601acb664031226cf9883908c793d364c2e07e63
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Fri Mar 22 13:49:08 2013 -0700

    Switch camera allocations to the system heap.

    The exynos heap is sometimes failing.

    Bug:8049715
    Change-Id: Id1a25ea1ce44f26693c5ee9a72d6c5a5126b9b69
    Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

commit 483728e7cd506afa89d8ace7ffe43f841c73725b
Author: Alex Ray <aray@google.com>
Date:   Wed Mar 27 16:29:00 2013 -0700

    libcamera2: initialize camera device AF state

    Bug: 8491870
    Change-Id: I29922e819a0274f8ab9a102d998659070fd35341

commit 5c664f4ce4110c37bd30fdedb79026780635f308
Author: Alex Ray <aray@google.com>
Date:   Wed Mar 27 14:34:03 2013 -0700

    libcamera2: Handle ion_alloc failures

    Return error when failing to allocate sensor scratch buffers in device
    open.

    Bug: 8049715
    Change-Id: Ib7e05e226ab08190f4bf933f8aa06ccd44758508

commit 690c39906e5dab752a87ed741c94ae4b6fc6db20
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Mon Mar 11 14:31:56 2013 +0900

    exynos_omx: multi_thread: Support for CTS DecodeEditEncodeTest.

    Added code to check the length of the input data in encoding time.

    Bug: 8329017

    Change-Id: I58e84625bf4b56c90404cbe3b5abc2bf693f1673
    Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>

commit ed9dc1f8074491341696bf7d9192b87784963b4a
Merge: d09ee48 da8940f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:44:27 2013 -0700

    am da8940f4: am 71dc25d1: am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'da8940f4e81a3f56ace5699b89cc4e09779904ef':

commit da8940f4e81a3f56ace5699b89cc4e09779904ef
Merge: d6b94e5 71dc25d
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:13:32 2013 -0700

    am 71dc25d1: am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '71dc25d1929a80c636008d0e491bfa282d69bec0':

commit 71dc25d1929a80c636008d0e491bfa282d69bec0
Merge: 5552dee 58ac276
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 13:00:37 2013 -0700

    am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '58ac276242d6fd28324bb9c0f09aff64765c4d8e':

commit 58ac276242d6fd28324bb9c0f09aff64765c4d8e
Merge: e1b99ca a03f07f
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:41:59 2013 -0700

    am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'a03f07f013265d3e5f8ee36184c613d9b5032c11':

commit a03f07f013265d3e5f8ee36184c613d9b5032c11
Merge: e1b99ca d2e43dc
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:27:40 2013 -0700

    am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'd2e43dce632fdcdf56927635b6bbd48d90ec796d':

commit d2e43dce632fdcdf56927635b6bbd48d90ec796d
Merge: d881a0c 7219980
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Mar 11 12:20:50 2013 -0700

    Reconcile with jb-mr1-release - do not merge

commit d09ee48e1cd72e2b14cdba926a409fec3c9fbe43
Author: Alex Ray <aray@google.com>
Date:   Tue Mar 5 12:47:50 2013 -0800

    gralloc: add private field to indicate chromaticity

    Separate differentiation between gamuts (wide vs narrow) and
    chromaticities (BT.601 vs BT.709).

    Change-Id: I892408fae5d12034067c02fe41b03f21b4274af5

commit 472449a8299bb7a2a512caaa60424cdbb8e84a97
Author: Bartosz Szatkowski <barsza01@arm.com>
Date:   Tue Feb 19 12:49:30 2013 +0000

    Use 64B alignment for RGB buffers

    Change-Id: Ia36c1638abfae19d988b026f193e6cd281db040f

commit 81a947bab57706cee77c14a4f47522ae8b400689
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Wed Jan 16 15:23:19 2013 +0900

    exynos_omx: multi_thread: Support EOSBehavior.

    Support EOSBehavior for testEOSBehaviorH263 & testEOSBehaviorH264.

    Bug: 7961269

    Change-Id: I13f93b2bfd01fb5c0678da3b0c9b9de7f4a863ee
    Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>

commit e94e7760b6b287daceefb9828bdaf9cec3d34147
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Feb 19 10:17:18 2013 -0800

    hwc: is_offscreen() should look at display frame, not source crop

    Change-Id: I8cde6d6086caaf9e1363f5b2532315da811a1ae9
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 90f24801864719d76f29800eb120a84829364031
Merge: b528b80 e8f5f3e
Author: Kenny Root <kroot@google.com>
Date:   Fri Feb 15 17:35:29 2013 +0000

    Merge "Hardware keymaster HAL should not indicate 'software'"

commit e8f5f3e087df4825e30e25cb4bdd7daa02c73e65
Author: Kenny Root <kroot@google.com>
Date:   Thu Nov 29 11:42:59 2012 -0800

    Hardware keymaster HAL should not indicate 'software'

    Remove the 'software' flag so that keystore knows that this is a
    hardware implementation.

    Bug: 7106634
    Change-Id: I1eef2d3564dc4e687644bd156694c893cc9a8e8d

commit b528b809765d8b92a9d4f35e127e6427ab459453
Author: Alex Ray <aray@google.com>
Date:   Wed Jan 30 21:19:59 2013 -0800

    gralloc: add private field to indicate gamut

    Differentiate between YUV buffers with JFIF and BT.601 gamuts (value
    ranges).

    Bug: 7985212
    Change-Id: I91c3d97858b4d2a54e2d2c67e3417715024561bb

commit 96e4aa13425191365eb04752736fbde9938e7a51
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Jan 14 15:56:05 2013 -0800

    omx: use G2D CSC for encoding surface textures

    Change-Id: I1c7297f35b7740a5a9f0ce040c005135125c15fe
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 8f10f92ba026b460bb068beaebe279fb3b31f854
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Jan 14 15:54:46 2013 -0800

    csc: support hardware CSC with G2D

    Change-Id: Id6d16e4f79245e1895e8bc66372eef27509722b9
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit c3fb36ed7a4d3d0a5a54f32b1113894651d3b9fe
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Jan 14 15:30:24 2013 -0800

    csc: allow compiling with multiple HW types

    Once G2D support is added, the same binary should be usable for either
    Gscaler or G2D.  The HW type is controlled through the new property
    CSC_HW_PROPERTY_HW_TYPE.

    Also return an error if any hardware properties are set after the device
    is already opened.  This didn't work before and should never happen, but
    it's worth adding a check just in case.

    Change-Id: I6d3fab4e777395a7e14a1f54353100902c76f75e
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 8c372e39ec50e4f441fcc04de8dc1a7f67ae268a
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Jan 15 09:29:40 2013 -0800

    gralloc: fix struct private_module_t definition for C usage

    Change-Id: I615294c1b2fcf2fd2a7dc465a4b8351f00c8003c
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 4179445814d8cc26dc5e7438666d31cbc2a6befd
Merge: 1cde81a d6b94e5
Author: Igor Murashkin <iam@google.com>
Date:   Wed Jan 30 18:59:46 2013 -0800

    am d6b94e50: (-s ours) am 5552deeb: hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE

    # Via Android Git Automerger (1) and Igor Murashkin (1)
    * commit 'd6b94e50e937003c60bbdf832a0d16337de14b09':
      hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE

commit d6b94e50e937003c60bbdf832a0d16337de14b09
Merge: 7ab1561 5552dee
Author: Igor Murashkin <iam@google.com>
Date:   Wed Jan 30 18:57:18 2013 -0800

    am 5552deeb: hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE

    # Via Igor Murashkin
    * commit '5552deebff413d7ef0e3bc308231406057554bd6':
      hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE

commit 5552deebff413d7ef0e3bc308231406057554bd6
Author: Igor Murashkin <iam@google.com>
Date:   Tue Nov 27 16:24:58 2012 -0800

    hardware: samsung_slsi: libcamera2: fix metadata symbols: DO NOT MERGE

    Change-Id: I2088c777fa0ac6841189d07c520b5607fc898021

commit 1cde81a92696347e54ec92b9e813af89ae15fa67
Merge: afd4d5d 88c9cff
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Jan 16 11:38:59 2013 -0800

    Merge "Add chunk heap, use it for gralloc buffers"

commit 88c9cff4734fb44e5b02ead6e45cc8cc163e790a
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Jan 9 15:37:04 2013 -0800

    Add chunk heap, use it for gralloc buffers

    Rather than allocating buffers solely from system memory
    we will now attempt to first allocate them out of a specific
    graphics carveout.  If there isn't space for a buffer in the
    carveout the system heap will be used instead.

    Change-Id: I30844123910209a0201c9462fb4776f123537e50
    Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

commit afd4d5db363a7bd9495e346b3d47a0dbd699a32e
Merge: 7bfc1ef fe7c260
Author: Greg Hackmann <ghackmann@google.com>
Date:   Fri Jan 11 15:13:38 2013 -0800

    Merge changes I2d46ea67,I495816ec,I652b6edb,Ia465f8bc,I575bef5d,I75f0d096,I28fa1db0,Ie5931a15

    * changes:
      omx: use hardware CSC for encoding surface textures
      omx: move csc (de)initialization to common venc
      omx: handle csc errors
      omx: always set ion fds for encoder's csc target buffers
      csc: add csc_set_method()
      csc: handle Gscaler errors
      csc: recognize custom ARGB_8888 pixel format
      csc: fix custom ARGB_8888 pixel format's name

commit fe7c2607ce58e81c1983851e996572b82683f030
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Jan 8 09:44:32 2013 -0800

    omx: use hardware CSC for encoding surface textures

    Shares Gscaler 3 with HDMI

    Change-Id: I2d46ea67ad105c98f09ab6aa6f298441c4361b5c
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit cf09147955c0f14c06a548c1310c3683831c37bd
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Jan 8 12:27:12 2013 -0800

    omx: move csc (de)initialization to common venc

    Change-Id: I495816ec592ecebdcceae760b1c1e90c26b223da
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit ebd30f82ab062c98c11004e3bac3f2c703f28283
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Dec 10 15:29:38 2012 -0800

    omx: handle csc errors

    Change-Id: I652b6edb9687ec063ec2b110c70031e821d34e7f
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 8ee7ad9c39198166a3964a91fdbfafc4c24d7976
Author: Greg Hackmann <ghackmann@google.com>
Date:   Fri Nov 30 14:57:24 2012 -0800

    omx: always set ion fds for encoder's csc target buffers

    Change-Id: Ia465f8bcce7ea1b68088a9443d26d48bc90a24a3
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 4f74fdadbd9c8ac886935e144862cbe1e2cbf2e3
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Jan 8 12:30:39 2013 -0800

    csc: add csc_set_method()

    Change-Id: I575bef5d62ae6414c43dac7d9fcdf58978850a93
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 4328d3947562a17ab929b0ac2bfe67497f9e1d07
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Dec 10 15:28:45 2012 -0800

    csc: handle Gscaler errors

    Change-Id: I75f0d0966e9f7ef10068645df0f41fa6b837c517
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 129f353cd0597f7acd05097f4bca0b3c5890dc23
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Jan 3 11:25:45 2013 -0800

    csc: recognize custom ARGB_8888 pixel format

    Map to V4L2 RGB32 which the gsc kernel driver interprets as XRGB

    Change-Id: I28fa1db0b882bab120254337f40b3172074d4eca
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit ae570c5d1b371aca69f7391c9dcdad74ac0202db
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Jan 3 11:22:37 2013 -0800

    csc: fix custom ARGB_8888 pixel format's name

    Change-Id: Ie5931a15bcfcfc9c2bdcad416987459d8f85fc2b
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 7bfc1ef50251fe84d138cea9c7e8c1c41ded6861
Merge: 2db7dad a58b42d
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Mon Jan 7 10:27:16 2013 -0800

    Merge "Camera: Fix duplicated code."

commit a58b42dfecf76f3c066a543f95fdb16e85d5d3b1
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Fri Jan 4 14:26:49 2013 -0800

    Camera: Fix duplicated code.

    Due to two identical commits (15fd82319b and 6d8e5b08) getting merged
    into jb-mr1-dev and master, duplicate code ended up in the camera
    library after the second commit automerged into master.

    Remove the duplicate lines to fix CTS failure.

    Change-Id: Id91e3c9775f7191d1725cb6866fd2d972c3a0584

commit 2db7dad277936dfaa58ec03c67ac89a1cc4ba331
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Jan 3 13:55:51 2013 -0800

    omx: don't log encoder input buffers as errors

    Change-Id: I400d2e2b2276e60efaacacaaa74fd03582bc68e6
    Signed-off-by: Greg Hackmann <ghackmann@google.com>

commit 9d35e00164820884b0c3922478c09e04f3dd78e9
Author: Dima Zavin <dima@android.com>
Date:   Wed Dec 5 14:59:22 2012 -0800

    gralloc/hwc: read the screen res from the framebuffer modes list

    Change-Id: Icd69c79b85ec5ce4a4ff444a98afc0da4e5c0a87
    Signed-off-by: Dima Zavin <dima@android.com>

commit 6201909bad11eab8339ec8dbef4d0152231308af
Author: Dima Zavin <dima@android.com>
Date:   Mon Dec 10 14:42:05 2012 -0800

    omx: basecomponent: signal abendStateEvent if GetResource fails

    This always happens if the user tries to do multiple encoding
    sessions at the same time.

    Change-Id: I464b06b170de71ae77e43f76cb6f058ae95b703c
    Signed-off-by: Dima Zavin <dima@android.com>

commit b3ea4778dfb02a92f96e3d191b8d08a3c88ffae6
Merge: fd1276b 46a0729
Author: Dima Zavin <dima@android.com>
Date:   Thu Dec 6 15:03:40 2012 -0800

    Merge changes I456d9ef6,I593c0231

    * changes:
      hwc: do not require hdmi
      hwc: do not require manta to build

commit 46a07295367fbfcaa485e71125d41f947c9be39b
Author: Dima Zavin <dima@android.com>
Date:   Wed Dec 5 14:33:59 2012 -0800

    hwc: do not require hdmi

    Change-Id: I456d9ef6ea416a14b52b9e5548e9b469a2167696
    Signed-off-by: Dima Zavin <dima@android.com>

commit 4386f1c2200d778106bbfb81cc2db41a1bad6c12
Author: Dima Zavin <dima@android.com>
Date:   Wed Dec 5 14:14:50 2012 -0800

    hwc: do not require manta to build

    Change-Id: I593c0231305cc28d2d47bf7a56b7dc786267a36a
    Signed-off-by: Dima Zavin <dima@android.com>

commit fd1276b259b81ba698ae7ae9f641e80dc099ecdb
Author: Igor Murashkin <iam@google.com>
Date:   Tue Nov 27 16:24:58 2012 -0800

    hardware: samsung_slsi: libcamera2: fix metadata symbols

    Change-Id: I2088c777fa0ac6841189d07c520b5607fc898021

commit 27a1e27347b66d5075197e217ea43ea58dc98308
Merge: aad485d 7ab1561
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Thu Nov 29 12:51:53 2012 -0800

    am 7ab1561c: am e1b99ca8: exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.

    * commit '7ab1561c1be4976ba3be1e4992c480b4a20bd8e8':
      exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.

commit 7ab1561c1be4976ba3be1e4992c480b4a20bd8e8
Merge: 9e30117 e1b99ca
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Thu Nov 29 12:45:48 2012 -0800

    am e1b99ca8: exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.

    * commit 'e1b99ca8589f7f5bc0b019f7b50b8776a8f85bf0':
      exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.

commit aad485da258d94d32f2fa1e1a80d00ca3e2170be
Merge: c8a9913 9e30117
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Nov 28 10:49:05 2012 -0800

    am 9e30117d: Merge from AOSP

    * commit '9e30117d8a94bddafe135bd9f50af8b3ac7d2e99':
      Remove unnecessary dependency on keystore_client

commit 9e30117d8a94bddafe135bd9f50af8b3ac7d2e99
Merge: 88f05e8 59e54dd
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Wed Nov 28 10:45:54 2012 -0800

    Merge from AOSP

    Change-Id: I885abca951326c884d6e64536ebaa3da0220d461

commit e1b99ca8589f7f5bc0b019f7b50b8776a8f85bf0
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Fri Nov 16 13:03:45 2012 +0900

    exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.

    Add OMX_IndexParamVideoIntraRefresh support, with "Cyclic intra marcoblock refresh" mode support only.
    Don't support "Adaptive intra-refresh".

    o related-to-bug: 7524845

    Change-Id: Id47c0cd3831db6fdb4e46ccece8f8d6f955d777a
    Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>

commit c8a9913afea1419253f6948450275a48fffb5aee
Merge: 70b4345 88f05e8
Author: Benoit Goby <benoit@android.com>
Date:   Tue Nov 27 18:36:12 2012 -0800

    resolved conflicts for merge of 88f05e8d to master

    Change-Id: Ib18aebd1c0f4f3ace3d7307109fcc6ae5c7a7d65

commit 70b4345916cacd7c7c5a27e384b16402b23c9beb
Merge: ff441d3 69830d6
Author: Dima Zavin <dima@android.com>
Date:   Tue Nov 27 17:33:35 2012 -0800

    am 69830d60: am 0183af75: Merge "omx: basecomponent: signal abendStateEvent if componentInit fails" into jb-mr1.1-dev

    * commit '69830d602d844af99dcbc9fa09629cc27e505e3c':
      omx: basecomponent: signal abendStateEvent if componentInit fails

commit 88f05e8db5f544366cf5418f40b294ef433c8e05
Merge: 69830d6 5280dde
Author: Benoit Goby <benoit@android.com>
Date:   Tue Nov 27 12:56:02 2012 -0800

    am 5280dde0: Merge "hwc: Hide layer1 if the FB_TAGET layer is not needed" into jb-mr1.1-dev

    * commit '5280dde0bf97c9f3f0ba6bde0a3ee890bb281074':
      hwc: Hide layer1 if the FB_TAGET layer is not needed

commit 5280dde0bf97c9f3f0ba6bde0a3ee890bb281074
Merge: 0183af7 18893a3
Author: Benoit Goby <benoit@android.com>
Date:   Tue Nov 27 12:51:54 2012 -0800

    Merge "hwc: Hide layer1 if the FB_TAGET layer is not needed" into jb-mr1.1-dev

commit 69830d602d844af99dcbc9fa09629cc27e505e3c
Merge: 3a0eba1 0183af7
Author: Dima Zavin <dima@android.com>
Date:   Tue Nov 27 11:36:39 2012 -0800

    am 0183af75: Merge "omx: basecomponent: signal abendStateEvent if componentInit fails" into jb-mr1.1-dev

    * commit '0183af759fed11a4cb388c7045dc57cce4813191':
      omx: basecomponent: signal abendStateEvent if componentInit fails

commit 0183af759fed11a4cb388c7045dc57cce4813191
Merge: a7fc593 0996d9d
Author: Dima Zavin <dima@android.com>
Date:   Tue Nov 27 10:03:46 2012 -0800

    Merge "omx: basecomponent: signal abendStateEvent if componentInit fails" into jb-mr1.1-dev

commit ff441d32d415b00115c5dc63f1978c4feff10d07
Merge: 02893a4 3a0eba1
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Tue Nov 20 13:39:23 2012 -0800

    am 3a0eba15: am a7fc5930: exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.

    * commit '3a0eba15a8d165f8a75ace07cbbe74c43555bcb7':
      exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.

commit 3a0eba15a8d165f8a75ace07cbbe74c43555bcb7
Merge: 2943468 a7fc593
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Tue Nov 20 13:36:43 2012 -0800

    am a7fc5930: exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.

    * commit 'a7fc593060b63bdeb9c3c5295157b04944d2a524':
      exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.

commit a7fc593060b63bdeb9c3c5295157b04944d2a524
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Tue Nov 20 12:33:33 2012 +0900

    exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.

    Add config dynamic change of "encode component".

    Bug: 7546690

    Change-Id: I82b043d51aa8295929201ce26c2b1afd5bcdb0e8
    Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>

commit 02893a485dfa8b9c98904794325ed0b467c40c4e
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Oct 2 11:39:13 2012 -0700

    hwc: set retire fence fds

    Change-Id: Iece6483e6402a9a425086b8ee8e67e17909b7d8a

commit 0996d9d5d25dcf3c90e40288a2e151dfbbf16959
Author: Dima Zavin <dima@android.com>
Date:   Thu Nov 8 14:30:43 2012 -0800

    omx: basecomponent: signal abendStateEvent if componentInit fails

    Bug: 7261738
    Change-Id: I1baf82b37120207de9f757a66e76185e68a81b80
    Signed-off-by: Dima Zavin <dima@android.com>

commit 0a978e72eb133fcee5e801226195e3ec6c2e7c21
Author: Kenny Root <kroot@google.com>
Date:   Wed Nov 14 15:52:02 2012 -0800

    Remove unnecessary dependency on keystore_client

    Change-Id: I801740653a6a13cb85d85204e2c8fa1b5ea2f879
    (cherry picked from commit 60b72f63f6d36cfc87319bd720a4467fece6a548)

commit 59e54ddf3624b972ce990a73c90792f3e3c9dec3
Merge: 2943468 60b72f6
Author: Kenny Root <kroot@google.com>
Date:   Wed Nov 14 15:53:20 2012 -0800

    Merge "Remove unnecessary dependency on keystore_client"

commit 60b72f63f6d36cfc87319bd720a4467fece6a548
Author: Kenny Root <kroot@google.com>
Date:   Wed Nov 14 15:52:02 2012 -0800

    Remove unnecessary dependency on keystore_client

    Change-Id: I801740653a6a13cb85d85204e2c8fa1b5ea2f879

commit 18893a3d6f100040df0d2ca8b3570d729dc38475
Author: Benoit Goby <benoit@android.com>
Date:   Tue Oct 30 16:05:34 2012 -0700

    hwc: Hide layer1 if the FB_TAGET layer is not needed

    Leave layer1 enabled but hide it when not needed because if both layers
    get disabled, the hdmi mixer and phy will get powered off.

    Bug: 7363167
    Change-Id: I4a969be7fb7877b05e866488d71f478c8f1c0fb4

commit 9ab4ab6bde23cea698b9b11477a6e8b659f1def2
Merge: f62c01c 2943468
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:27:31 2012 -0800

    am 29434681: (-s ours) am f97103b5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit '29434681bcb2cf348411f790887473a41855baf8':

commit 29434681bcb2cf348411f790887473a41855baf8
Merge: 1273f1b f97103b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:24:31 2012 -0800

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

    * commit 'f97103b5f0e5a65a81f60bbe39cd563b655ce020':

commit f97103b5f0e5a65a81f60bbe39cd563b655ce020
Merge: d881a0c 6cf5cc6 7219980
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Nov 6 12:17:45 2012 -0800

    Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    Change-Id: I088f7356b684381f971b7e9f6773ba24f7f9b62a

commit f62c01c0843dc6686a9add82bfcf5907a031bfb5
Merge: a08bbc5 1273f1b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Nov 2 07:30:19 2012 -0700

    am 1273f1b7: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '1273f1b7ace1772bc115f4252f2925de0c5c102d':

commit 1273f1b7ace1772bc115f4252f2925de0c5c102d
Merge: 57b1843 7219980
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Nov 2 07:28:26 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ie34407add6de1a599529f03ac8954c792c400fbe

commit a08bbc567a2477eb292ac27153f62b165bd2bed9
Merge: b4ed183 57b1843
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Nov 1 15:25:38 2012 -0700

    am 57b18438: am d881a0ce: Allocate enough memory for HAL_PIXL_FORMAT_YV12

    * commit '57b18438ad3905465813ea88c05bb0e045a4db86':
      Allocate enough memory for HAL_PIXL_FORMAT_YV12

commit 57b18438ad3905465813ea88c05bb0e045a4db86
Merge: 4ed896c d881a0c
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Nov 1 15:22:24 2012 -0700

    am d881a0ce: Allocate enough memory for HAL_PIXL_FORMAT_YV12

    * commit 'd881a0ce901d839282ba2d4d724b9ae25c9d4e89':
      Allocate enough memory for HAL_PIXL_FORMAT_YV12

commit b4ed1835d9ef3c01711e90fe5f1f1483f00b04c4
Merge: 583e6c7 4ed896c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:22:27 2012 -0700

    am 4ed896ce: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '4ed896ce6a2e53de38d6d00fbe8750e48b2925ff':

commit 4ed896ce6a2e53de38d6d00fbe8750e48b2925ff
Merge: 0ad5fc6 32d8a9b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 31 09:17:40 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I655ef2dc4e9a7bd82b72287f41ba69a8009720ae

commit 583e6c789edae1a762afbdfb1f5ccc5ed28ed326
Merge: 1d87cce 0ad5fc6
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Thu Oct 25 16:06:37 2012 -0700

    am 0ad5fc61: am 34d2b94a: hardware: samsung_slsi: libcamera2: Fix flash torch mode

    * commit '0ad5fc615d65b3730af0f5324ab77608bdec0c15':
      hardware: samsung_slsi: libcamera2: Fix flash torch mode

commit 0ad5fc615d65b3730af0f5324ab77608bdec0c15
Merge: d8a9ba5 34d2b94
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Thu Oct 25 16:04:33 2012 -0700

    am 34d2b94a: hardware: samsung_slsi: libcamera2: Fix flash torch mode

    * commit '34d2b94a1d314524aa47d1c9071d9b5027332d65':
      hardware: samsung_slsi: libcamera2: Fix flash torch mode

commit 1d87cce560563897ef592f4f9e7a24c39c3828a7
Merge: 8670078 d8a9ba5
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 24 19:50:44 2012 -0700

    am d8a9ba56: am c48f0170: hardware: samsung_slsi: libcamera2: Add AF state reset on mode change

    * commit 'd8a9ba56c466363a667db929d6c7e4d7f1387456':
      hardware: samsung_slsi: libcamera2: Add AF state reset on mode change

commit 86700786dac1d5129f6046fec34fae73a9a4321a
Merge: cf6ee6f 254446d
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 24 19:50:43 2012 -0700

    am 254446de: am ca714238: hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger

    * commit '254446de077e616565bda36a20f54d7d7004b744':
      hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger

commit d8a9ba56c466363a667db929d6c7e4d7f1387456
Merge: 254446d c48f017
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 24 19:48:55 2012 -0700

    am c48f0170: hardware: samsung_slsi: libcamera2: Add AF state reset on mode change

    * commit 'c48f0170bf56ff4911998bc531e8547bcf0d024f':
      hardware: samsung_slsi: libcamera2: Add AF state reset on mode change

commit 254446de077e616565bda36a20f54d7d7004b744
Merge: 366d3ea ca71423
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 24 19:48:55 2012 -0700

    am ca714238: hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger

    * commit 'ca714238a7b555c412637d25006c17f1f0ce2751':
      hardware: samsung_slsi: libcamera2: Synchronize AF mode and trigger

commit cf6ee6fdff8279d94294500af4e1a0e3c2326f55
Merge: c0934d1 366d3ea
Author: Benoit Goby <benoit@android.com>
Date:   Wed Oct 24 12:42:53 2012 -0700

    am 366d3ea9: am 56208452: hwc: Add properties to control hdcp and color range

    * commit '366d3ea9d2fa91d58e5f06b8d9c99cef45db0917':
      hwc: Add properties to control hdcp and color range

commit 366d3ea9d2fa91d58e5f06b8d9c99cef45db0917
Merge: dc3932a 5620845
Author: Benoit Goby <benoit@android.com>
Date:   Wed Oct 24 12:40:57 2012 -0700

    am 56208452: hwc: Add properties to control hdcp and color range

    * commit '56208452f4f55fbb2b8e39355f5308fe08603e6e':
      hwc: Add properties to control hdcp and color range

commit c0934d128019e73434feff8728122a24af751dcf
Merge: 36e18f3 dc3932a
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Tue Oct 23 16:25:18 2012 -0700

    am dc3932a6: am a0648fc7: hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot

    * commit 'dc3932a6f257c1ed958cd9262eff41293c900096':
      hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot

commit 36e18f3cf14c54704d591e9add3e5d59e73ea9c2
Merge: 26279e9 64335cd
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Tue Oct 23 16:25:17 2012 -0700

    am 64335cdc: am 6a87e47a: hardware: samsung_slsi: libcamera2: clipping fd score to the max score

    * commit '64335cdc68ea0037f7d03ff60d0e581ed7dcf24a':
      hardware: samsung_slsi: libcamera2: clipping fd score to the max score

commit dc3932a6f257c1ed958cd9262eff41293c900096
Merge: 64335cd a0648fc
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Tue Oct 23 16:22:15 2012 -0700

    am a0648fc7: hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot

    * commit 'a0648fc71e705cf211caa991639e2a559e1498d9':
      hardware: samsung_slsi: libcamera2: ensure disabling flash at video snapshot

commit 64335cdc68ea0037f7d03ff60d0e581ed7dcf24a
Merge: 61752cf 6a87e47
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Tue Oct 23 16:22:04 2012 -0700

    am 6a87e47a: hardware: samsung_slsi: libcamera2: clipping fd score to the max score

    * commit '6a87e47a1b93226f778d859a37b0e4655785a4a8':
      hardware: samsung_slsi: libcamera2: clipping fd score to the max score

commit 26279e9e10958e6a469b855a7b0a25b535ed56bb
Merge: b8d105c 61752cf
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 22 16:55:29 2012 -0700

    am 61752cf1: am 3c17a3f7: hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes

    * commit '61752cf12b26800c4ca3b062a6924e503d9bfc23':
      hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes

commit 61752cf12b26800c4ca3b062a6924e503d9bfc23
Merge: 0bf23a4 3c17a3f
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 22 16:53:17 2012 -0700

    am 3c17a3f7: hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes

    * commit '3c17a3f79068fef751c777a7c13830d23e5f51cf':
      hardware: samsung_slsi: libcamera2: Fix for supporting various FPS modes

commit b8d105ca3b226b8c98e634a2bb1c59fec3a34f8a
Merge: 7c91820 0bf23a4
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Oct 18 21:07:18 2012 -0700

    am 0bf23a4c: am 92b0aadb: hwc: adjust protected content scaling for gscaler width constraints

    * commit '0bf23a4c6f54333c896f74a7d434a7c15adf99a6':
      hwc: adjust protected content scaling for gscaler width constraints

commit 0bf23a4c6f54333c896f74a7d434a7c15adf99a6
Merge: 895156d 92b0aad
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Oct 18 21:05:06 2012 -0700

    am 92b0aadb: hwc: adjust protected content scaling for gscaler width constraints

    * commit '92b0aadb2237196ee193c6500c6f864c8497c97a':
      hwc: adjust protected content scaling for gscaler width constraints

commit 7c91820dbf83d264191445690522143a3d4e12a8
Merge: d5ec1c4 895156d
Author: James Dong <jdong@google.com>
Date:   Wed Oct 17 20:21:45 2012 -0700

    am 895156de: am d08bf0b2: Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev

    * commit '895156dea6431fec87200f3b943abafe19c152c2':
      Added error handling in the state change from "Load state" to "Idle state".

commit 895156dea6431fec87200f3b943abafe19c152c2
Merge: 770097a d08bf0b
Author: James Dong <jdong@google.com>
Date:   Wed Oct 17 20:19:41 2012 -0700

    am d08bf0b2: Merge "Added error handling in the state change from "Load state" to "Idle state"." into jb-mr1-dev

    * commit 'd08bf0b27662d58d1768123dc5e370322fc0308a':
      Added error handling in the state change from "Load state" to "Idle state".

commit d5ec1c4e8ee62786b54ea600f5546d0177e53732
Merge: 6cb9d9a 770097a
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 17 17:45:50 2012 -0700

    am 770097a8: am 0757ed8e: hardware: samsung_slsi: libcamera2: Add 15fps mode support

    * commit '770097a8c0ab093e347f5d7c28c5b7467cfff440':
      hardware: samsung_slsi: libcamera2: Add 15fps mode support

commit 770097a8c0ab093e347f5d7c28c5b7467cfff440
Merge: 386c020 0757ed8
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 17 17:42:58 2012 -0700

    am 0757ed8e: hardware: samsung_slsi: libcamera2: Add 15fps mode support

    * commit '0757ed8e7902eff0f8ef114ac97fb4a732243c1c':
      hardware: samsung_slsi: libcamera2: Add 15fps mode support

commit 6cb9d9a5de6dcbac96339ab0c22731990876cc94
Merge: 60aae0c 386c020
Author: James Dong <jdong@google.com>
Date:   Wed Oct 17 16:41:21 2012 -0700

    am 386c0203: am 2f9c21c5: Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode" into jb-mr1-dev

    * commit '386c0203dc459d296430c520636ecf57be97b7c0':
      hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode

commit 386c0203dc459d296430c520636ecf57be97b7c0
Merge: fd75ce9 2f9c21c
Author: James Dong <jdong@google.com>
Date:   Wed Oct 17 16:38:41 2012 -0700

    am 2f9c21c5: Merge "hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode" into jb-mr1-dev

    * commit '2f9c21c521cf8b1bc242ad365fc0e3fe31be5979':
      hardware: samsung_slsi: libcamera2: Remove fixed-FPS for recording mode

commit 60aae0c02b95af81790a277d2ab8c8e51321b8d2
Merge: 216ee47 fd75ce9
Author: DongJin Park <djpax.park@samsung.com>
Date:   Tue Oct 16 23:49:56 2012 -0700

    am fd75ce97: am 2821a826: mobicore: update daemon to handle MobiCore halt status

    * commit 'fd75ce97c008976f763d5106e03bc61d2b375093':
      mobicore: update daemon to handle MobiCore halt status

commit fd75ce97c008976f763d5106e03bc61d2b375093
Merge: d193f78 2821a82
Author: DongJin Park <djpax.park@samsung.com>
Date:   Tue Oct 16 23:47:01 2012 -0700

    am 2821a826: mobicore: update daemon to handle MobiCore halt status

    * commit '2821a826dbd3097b27801e02a2d7bc412a02e76c':
      mobicore: update daemon to handle MobiCore halt status

commit 216ee47c8d6dbe3f2d19b49714c67ef6be099d9b
Merge: 40c9acb d193f78
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Oct 16 16:07:38 2012 -0700

    am d193f787: am 5d99ec51: hwc: set Gscaler to narrow RGB for YUV surfaces

    * commit 'd193f78749f9451b7ff34d582e32d8faa2e423c1':
      hwc: set Gscaler to narrow RGB for YUV surfaces

commit 40c9acb147bf162f50f9021eb24746cad8718e27
Merge: 80747ed 9cd7e97
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Oct 16 16:07:37 2012 -0700

    am 9cd7e979: am bcd3f11d: libgscaler: add csc range field

    * commit '9cd7e979c812b9b151a372ebfcc7ac733b0b51cb':
      libgscaler: add csc range field

commit d193f78749f9451b7ff34d582e32d8faa2e423c1
Merge: 9cd7e97 5d99ec5
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Oct 16 16:05:56 2012 -0700

    am 5d99ec51: hwc: set Gscaler to narrow RGB for YUV surfaces

    * commit '5d99ec51e355e21a6c31c9a071f9eaf495a5acda':
      hwc: set Gscaler to narrow RGB for YUV surfaces

commit 9cd7e979c812b9b151a372ebfcc7ac733b0b51cb
Merge: 23e6502 bcd3f11
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Oct 16 16:05:55 2012 -0700

    am bcd3f11d: libgscaler: add csc range field

    * commit 'bcd3f11d136665f5f508aa802d27e9f4ed888b4e':
      libgscaler: add csc range field

commit 80747edb5740f75b9976605760befdd09bde6d18
Merge: 977d595 23e6502
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Mon Oct 15 21:08:36 2012 -0700

    am 23e6502e: am af4568d1: OMX encode component has problem on "idle->execute->idle state change" without input data. This patch fixes the state change (Execute to Idle) bug.

    * commit '23e6502e2bfabd2e7c97691b5733070c5ab2fdc2':
      OMX encode component has problem on "idle->execute->idle state change" without input data. This patch fixes the state change (Execute to Idle) bug.

commit 23e6502e2bfabd2e7c97691b5733070c5ab2fdc2
Merge: 5aa93b7 af4568d
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Mon Oct 15 21:06:23 2012 -0700

    am af4568d1: OMX encode component has problem on "idle->execute->idle state change" without input data. This patch fixes the state change (Execute to Idle) bug.

    * commit 'af4568d16d0afed7604e9496ad42e2fcf1e44fde':
      OMX encode component has problem on "idle->execute->idle state change" without input data. This patch fixes the state change (Execute to Idle) bug.

commit 977d59505cc907325a56917a1bd9e3d0a6abb260
Merge: 5e237d2 5aa93b7
Author: Ying Wang <wangying@google.com>
Date:   Mon Oct 15 13:19:01 2012 -0700

    am 5aa93b71: am 2df010e4: Merge "CleanSpec.mk should sit at the root of a git project." into jb-mr1-dev

    * commit '5aa93b71ca38320677dd6f9689873279e5c16876':
      CleanSpec.mk should sit at the root of a git project.

commit 5aa93b71ca38320677dd6f9689873279e5c16876
Merge: e09990a 2df010e
Author: Ying Wang <wangying@google.com>
Date:   Mon Oct 15 13:17:34 2012 -0700

    am 2df010e4: Merge "CleanSpec.mk should sit at the root of a git project." into jb-mr1-dev

    * commit '2df010e4156a6778e45457062bb7ed165379304c':
      CleanSpec.mk should sit at the root of a git project.

commit 5e237d2681dfcf86efeb2060e729d3e803cbd32f
Merge: 31d5745 e09990a
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 15 12:13:27 2012 -0700

    am e09990ad: am b54c514c: Merge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev

    * commit 'e09990ad1bd4957ac643ea7e292793211a25c75f':
      hwc: protect on-screen gscaler buffers

commit e09990ad1bd4957ac643ea7e292793211a25c75f
Merge: 175891e b54c514
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 15 12:11:48 2012 -0700

    am b54c514c: Merge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev

    * commit 'b54c514c7e429d3a50bed7c68370babbf1b2b47c':
      hwc: protect on-screen gscaler buffers

commit 31d57456d77f943ece82722fa8e5fff45588b576
Merge: 4bb6e22 175891e
Author: Ying Wang <wangying@google.com>
Date:   Mon Oct 15 12:11:48 2012 -0700

    am 175891ef: am 5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev

    * commit '175891efcec34f752573a2779b0890ed159bad98':
      Don't call my-dir

commit 175891efcec34f752573a2779b0890ed159bad98
Merge: c95c1af 5403f3c
Author: Ying Wang <wangying@google.com>
Date:   Mon Oct 15 12:10:05 2012 -0700

    am 5403f3c9: Merge "Don\'t call my-dir" into jb-mr1-dev

    * commit '5403f3c9447193abd30ecc25245a95af03d45d14':
      Don't call my-dir

commit 4bb6e22b3baab1f90a5021aa3ecd1eec3a0fb849
Merge: 2d9e595 c95c1af
Author: Dima Zavin <dima@android.com>
Date:   Mon Oct 15 11:25:09 2012 -0700

    am c95c1af0: am f046c50a: mobicore: McClient: add cleanspec so include exports are picked up

    * commit 'c95c1af0b8e910f638919cb3a5c1236fa17fa8dd':
      mobicore: McClient: add cleanspec so include exports are picked up

commit c95c1af0b8e910f638919cb3a5c1236fa17fa8dd
Merge: b04853d f046c50
Author: Dima Zavin <dima@android.com>
Date:   Mon Oct 15 11:23:20 2012 -0700

    am f046c50a: mobicore: McClient: add cleanspec so include exports are picked up

    * commit 'f046c50ad3030aed0dd4d0ca6e30d2c30f8458e4':
      mobicore: McClient: add cleanspec so include exports are picked up

commit 2d9e595b45f321de4eda2ddc784ee6ff8a598a28
Merge: c9fca3c b04853d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Oct 15 07:43:01 2012 -0700

    am b04853d0: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit 'b04853d02d28d726088cc3a17e8494d72b94832d':

commit b04853d02d28d726088cc3a17e8494d72b94832d
Merge: a7048da 6cf5cc6 63d37df
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Oct 15 07:39:26 2012 -0700

    Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    Change-Id: I36b01d357124ec3cc9a4301ade13a44c2c524a3a

commit 6cf5cc66645acb39168ecd05c3cd8bbc8421a20c
Merge: a37db02 7defd0f
Author: The Android Automerger <android-build@android.com>
Date:   Fri Oct 12 16:34:36 2012 -0700

    merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit c9fca3cff61f41ebca8a12f60b8d0a3d52640303
Merge: b767a28 a7048da
Author: Benoit Goby <benoit@android.com>
Date:   Fri Oct 12 11:14:30 2012 -0700

    am a7048da3: am a37db02b: hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done

    * commit 'a7048da3f65a29745c74fc2f77a79f338b42abb7':
      hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done

commit a7048da3f65a29745c74fc2f77a79f338b42abb7
Merge: 6bfef85 a37db02
Author: Benoit Goby <benoit@android.com>
Date:   Fri Oct 12 11:10:28 2012 -0700

    am a37db02b: hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done

    * commit 'a37db02bd1f444fc949270cd0f8d6a9d178b8965':
      hwc: Call V4L2_CID_TV_UPDATE when mixer configuration is done

commit b767a281ee080a5f38d0a7595e8acc98fd2aaac4
Merge: b240969 6bfef85
Author: Dima Zavin <dima@android.com>
Date:   Fri Oct 12 11:10:20 2012 -0700

    am 6bfef851: am 33aa35f1: libgscaler: enable/disable hardware content protection during drm playback

    * commit '6bfef85159e3e7dc586178ec38ee37f11d0466c9':
      libgscaler: enable/disable hardware content protection during drm playback

commit b240969f4b610df641a633d557ff39e01c0c8061
Merge: 9c2e41e a7cb922
Author: Jungtae Kim <jt1217.kim@samsung.com>
Date:   Fri Oct 12 11:10:18 2012 -0700

    am a7cb9221: am 05e76763: hardware: samsung_slsi: exynos5: add secure path configure API

    * commit 'a7cb922115512f6ce6ba3c667c97c452180055af':
      hardware: samsung_slsi: exynos5: add secure path configure API

commit 6bfef85159e3e7dc586178ec38ee37f11d0466c9
Merge: a7cb922 33aa35f
Author: Dima Zavin <dima@android.com>
Date:   Fri Oct 12 11:04:13 2012 -0700

    am 33aa35f1: libgscaler: enable/disable hardware content protection during drm playback

    * commit '33aa35f1c81c92e5b44ddc898fed85ad39e1908b':
      libgscaler: enable/disable hardware content protection during drm playback

commit a7cb922115512f6ce6ba3c667c97c452180055af
Merge: a0f3ee6 05e7676
Author: Jungtae Kim <jt1217.kim@samsung.com>
Date:   Fri Oct 12 11:04:12 2012 -0700

    am 05e76763: hardware: samsung_slsi: exynos5: add secure path configure API

    * commit '05e767638571bc50d7a26471fbe07005f3c875fa':
      hardware: samsung_slsi: exynos5: add secure path configure API

commit 7defd0f74a7b1aa4be3f3f69a5b9ca05a69b38ad
Merge: 33aa35f 1fa868b
Author: The Android Automerger <android-build@android.com>
Date:   Fri Oct 12 10:26:55 2012 -0700

    merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit 9c2e41e5c122a35bb804ae081fdb600a6bf17f62
Merge: db39f67 a0f3ee6
Author: Benoit Goby <benoit@android.com>
Date:   Thu Oct 11 17:54:26 2012 -0700

    am a0f3ee60: am cb4ed2fd: hwc: Implement blank per display

    * commit 'a0f3ee60a54dd87b463f9b04220b57aac6cf1da7':
      hwc: Implement blank per display

commit a0f3ee60a54dd87b463f9b04220b57aac6cf1da7
Merge: 0da7355 cb4ed2f
Author: Benoit Goby <benoit@android.com>
Date:   Thu Oct 11 17:13:37 2012 -0700

    am cb4ed2fd: hwc: Implement blank per display

    * commit 'cb4ed2fdb7e1242de8d61dba88ed23fe5f43a668':
      hwc: Implement blank per display

commit 1fa868bf7df50f011cb49374ade14bb77c650e1d
Merge: 3f32ce5 18c4df9
Author: The Android Automerger <android-build@android.com>
Date:   Thu Oct 11 08:19:26 2012 -0700

    merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit db39f67cfcdd55ace0fd1a94f166bc0abe8a7bc1
Merge: e17967b 0da7355
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 11 08:08:14 2012 -0700

    am 0da73557: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '0da73557cb81ba7940894fedb6193447ed9a9b91':

commit 0da73557cb81ba7940894fedb6193447ed9a9b91
Merge: 462002f c5e5828
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 11 08:05:27 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I52a831d8836bdb95f906bbaf6fce23f118aad20b

commit e17967badd09aa6b6e3e7d6a6baeaf585843aaa8
Merge: 2c0842f 462002f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 11 06:02:10 2012 -0700

    am 462002f8: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '462002f84a1e2a0354b67d11f8b445b60c8ecf82':

commit 462002f84a1e2a0354b67d11f8b445b60c8ecf82
Merge: d80f416 14cfaec
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 11 05:57:35 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ie7c1d6548cbbf6a143a734498d0df8cf6aa7b1ac

commit 2c0842f28478fbfb2447d5ebd613d69b339bd2c3
Merge: 9c33f57 d80f416
Author: Sanghee Kim <haya93@samsung.com>
Date:   Wed Oct 10 15:27:19 2012 -0700

    am d80f416d: am 3f32ce53: exynos5: hwc: add dst\'s crop size alignment.

    * commit 'd80f416d13f26fa701ae871aad8d73f77bf5adb9':
      exynos5: hwc: add dst's crop size alignment.

commit d80f416d13f26fa701ae871aad8d73f77bf5adb9
Merge: bb90934 3f32ce5
Author: Sanghee Kim <haya93@samsung.com>
Date:   Wed Oct 10 15:25:26 2012 -0700

    am 3f32ce53: exynos5: hwc: add dst\'s crop size alignment.

    * commit '3f32ce537a7870cff6ca32e34a8d965d2fa85172':
      exynos5: hwc: add dst's crop size alignment.

commit 9c33f57768f1684b8e0932499c80176ce4f04482
Merge: fa84321 bb90934
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 10 10:43:29 2012 -0700

    am bb909347: am 07ed0359: hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method

    * commit 'bb9093477c6395107fd1482a6a83dcecf71a5b3c':
      hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method

commit bb9093477c6395107fd1482a6a83dcecf71a5b3c
Merge: a388b6f 07ed035
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 10 10:41:25 2012 -0700

    am 07ed0359: hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method

    * commit '07ed03595bbba4e9ee5f8c10fa6637e2dc9d0569':
      hardware: samsung_slsi: libcamera2: Fix EXIF GPS Processing Method

commit fa8432171553fa3a96a28f11e1db7cb4b23b525c
Merge: b50dad2 a388b6f
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 10 09:47:49 2012 -0700

    am a388b6f3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    * commit 'a388b6f3158f06c3c2c6b8d16d35d87b9ec028a5':

commit a388b6f3158f06c3c2c6b8d16d35d87b9ec028a5
Merge: 7d0efc0 18c4df9 028bf50
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 10 09:45:13 2012 -0700

    Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

    Change-Id: I354767f1c1a08ea76bfba48c1a8e3f0700f445b9

commit 18c4df9ba7855da05d74570ec7c6a45072af6bbb
Merge: 3db6fe6 abf7533
Author: The Android Automerger <android-build@android.com>
Date:   Wed Oct 10 08:56:12 2012 -0700

    merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit b50dad2dae6bb914a34aead2d1cc698c4edc2b3d
Merge: 1b46bc0 7d0efc0
Author: Alex Ray <aray@google.com>
Date:   Tue Oct 9 18:22:24 2012 -0700

    am 7d0efc0f: am 3db6fe61: libcamera2: Round instead of truncate GPS Coords

    * commit '7d0efc0fc33cc12e51698d91112c2b9186cf8631':
      libcamera2: Round instead of truncate GPS Coords

commit 1b46bc036c963f2d7675d234acca2bf03c009ece
Merge: 2c896ae 34295d6
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Oct 9 18:22:23 2012 -0700

    am 34295d66: am 9c046e3a: hardware: samsung_slsi: libcamera2: Change square aspect resolution

    * commit '34295d66c84d0c7cee14b306f34eccc1c18e7988':
      hardware: samsung_slsi: libcamera2: Change square aspect resolution

commit 2c896ae4c96530a5eb53c85dbfff894ec1b1d9c5
Merge: fef7a1a a8b0caf
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Tue Oct 9 18:22:22 2012 -0700

    am a8b0caf2: am a038aa84: hardware: samsung_slsi: libcamera2: Fixed release stream bug.

    * commit 'a8b0caf20fa74cc390fa149d10db5cf61f9cccbd':
      hardware: samsung_slsi: libcamera2: Fixed release stream bug.

commit fef7a1aa1cd90ac405a8f90e6e427c21ff69716e
Merge: 703b498 b7d4671
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Oct 9 18:22:22 2012 -0700

    am b7d46711: am 32cf9401: hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress

    * commit 'b7d4671187d6a9101fe1ebf74814c886a8f31a34':
      hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress

commit 7d0efc0fc33cc12e51698d91112c2b9186cf8631
Merge: 34295d6 3db6fe6
Author: Alex Ray <aray@google.com>
Date:   Tue Oct 9 18:19:56 2012 -0700

    am 3db6fe61: libcamera2: Round instead of truncate GPS Coords

    * commit '3db6fe61b1cf514d4b9030d137434dddbb6ce3f5':
      libcamera2: Round instead of truncate GPS Coords

commit 34295d66c84d0c7cee14b306f34eccc1c18e7988
Merge: a8b0caf 9c046e3
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Oct 9 18:19:55 2012 -0700

    am 9c046e3a: hardware: samsung_slsi: libcamera2: Change square aspect resolution

    * commit '9c046e3a60c50acce5e390c1caf1864cacc3b584':
      hardware: samsung_slsi: libcamera2: Change square aspect resolution

commit a8b0caf20fa74cc390fa149d10db5cf61f9cccbd
Merge: b7d4671 a038aa8
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Tue Oct 9 18:19:55 2012 -0700

    am a038aa84: hardware: samsung_slsi: libcamera2: Fixed release stream bug.

    * commit 'a038aa84011c540c88d997107e80a9b6394e9180':
      hardware: samsung_slsi: libcamera2: Fixed release stream bug.

commit b7d4671187d6a9101fe1ebf74814c886a8f31a34
Merge: 10e4312 32cf940
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Oct 9 18:19:54 2012 -0700

    am 32cf9401: hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress

    * commit '32cf94013c9ba94ffaab68f942c7926ed007956f':
      hardware: samsung_slsi: libcamera2: Apply pending JPEG count to in_progress

commit 703b498053f3cbb977fe3f85f180f7a179f877d4
Merge: 77de086 10e4312
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Oct 9 13:38:30 2012 -0700

    am 10e43121: am 2ed2aecf: Revert "STOPSHIP libcamera2: remove device metadata"

    * commit '10e43121d45f62b26b194bf0caa8b09462390b9c':
      Revert "STOPSHIP libcamera2: remove device metadata"

commit 77de086faec748e91f5752615f16df2be59db166
Merge: caf3ec0 bdc29e9
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Oct 9 13:38:29 2012 -0700

    am bdc29e92: am bd4aea1e: Revert "STOPSHIP libcamera2: remove device metadata"

    * commit 'bdc29e927eda41fed1259d57cd268345b6bd42c9':
      Revert "STOPSHIP libcamera2: remove device metadata"

commit 10e43121d45f62b26b194bf0caa8b09462390b9c
Merge: bdc29e9 2ed2aec
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Oct 9 13:35:56 2012 -0700

    am 2ed2aecf: Revert "STOPSHIP libcamera2: remove device metadata"

    * commit '2ed2aecf5abca549c0f065f9b0fe043f325e42a8':
      Revert "STOPSHIP libcamera2: remove device metadata"

commit bdc29e927eda41fed1259d57cd268345b6bd42c9
Merge: 5d8d89d bd4aea1
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Oct 9 13:35:55 2012 -0700

    am bd4aea1e: Revert "STOPSHIP libcamera2: remove device metadata"

    * commit 'bd4aea1e512f4b4bfa5e3fc7a2ce8f0fa74fd27d':
      Revert "STOPSHIP libcamera2: remove device metadata"

commit caf3ec03364a787c9adf86fe231c6c87ff0fc6c6
Merge: f37ab89 5d8d89d
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Oct 9 09:42:51 2012 -0700

    am 5d8d89dd: am ab73a889: Align secure video surfaces to 1 MB

    * commit '5d8d89dd631acc7fd422e6b6701b7fb4ed0acce1':
      Align secure video surfaces to 1 MB

commit 5d8d89dd631acc7fd422e6b6701b7fb4ed0acce1
Merge: 8427155 ab73a88
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Oct 9 09:40:50 2012 -0700

    am ab73a889: Align secure video surfaces to 1 MB

    * commit 'ab73a889ad0d4ea853ab41a9f5b0cea11cac3fd8':
      Align secure video surfaces to 1 MB

commit f37ab89a5168b7bcdb9eb85cbcb4db2f01fda986
Merge: 52745d5 8427155
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Oct 9 09:01:04 2012 -0700

    am 84271554: am ef5f57a2: Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev

    * commit '8427155476615bd3a5a21d34c6d0e97228062fa6':
      hwc: always make forward progress in fimd set()

commit 8427155476615bd3a5a21d34c6d0e97228062fa6
Merge: 6ef93ca ef5f57a
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Oct 9 08:59:40 2012 -0700

    am ef5f57a2: Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev

    * commit 'ef5f57a25d92c7e159e024d0ad9b0c118c467da2':
      hwc: always make forward progress in fimd set()

commit 52745d5318c880948a1a527c1eb4c7139af848e3
Merge: 736cc3c 6ef93ca
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:31:44 2012 -0700

    am 6ef93cab: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '6ef93cabf7bf9adcc9274555cf7f4323202b4308':
      libgscaler: Fix acquireFenceFd leak with m2m gscalers

commit 6ef93cabf7bf9adcc9274555cf7f4323202b4308
Merge: 27dc360 3d63220
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 9 07:29:43 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I9deaa80a720da8fddae2d5420a75ec8c6247413a

commit 736cc3c9413da9ba7fd439ac8235ac51b4bcd49e
Merge: 5c0b8d9 27dc360
Author: Benoit Goby <benoit@android.com>
Date:   Mon Oct 8 16:23:03 2012 -0700

    am 27dc3607: am de5fb8ee: libgscaler: Fix acquireFenceFd leak with m2m gscalers

    * commit '27dc36077f62c47e9739103e0cce029f67828264':
      libgscaler: Fix acquireFenceFd leak with m2m gscalers

commit 5c0b8d93fc3757cce378a77981ca273f611b10a9
Merge: 30b8f53 679ae68
Author: Alex Ray <aray@google.com>
Date:   Mon Oct 8 16:21:42 2012 -0700

    am 679ae68e: am e43660b0: libcamera2: Prevent multiple camera open calls

    * commit '679ae68e1b453457c275e02085aad196ef4cfeba':
      libcamera2: Prevent multiple camera open calls

commit 27dc36077f62c47e9739103e0cce029f67828264
Merge: 679ae68 de5fb8e
Author: Benoit Goby <benoit@android.com>
Date:   Mon Oct 8 16:04:48 2012 -0700

    am de5fb8ee: libgscaler: Fix acquireFenceFd leak with m2m gscalers

    * commit 'de5fb8eea5a909f0b85d179d0e7336770c9c6c53':
      libgscaler: Fix acquireFenceFd leak with m2m gscalers

commit 679ae68e1b453457c275e02085aad196ef4cfeba
Merge: 58c0059 e43660b
Author: Alex Ray <aray@google.com>
Date:   Mon Oct 8 14:03:26 2012 -0700

    am e43660b0: libcamera2: Prevent multiple camera open calls

    * commit 'e43660b0942380839ac881a6af7106c4aace8a29':
      libcamera2: Prevent multiple camera open calls

commit 30b8f5311c511199bf60e30fa905b61c63842527
Merge: 0a9df89 58c0059
Author: Igor Murashkin <iam@google.com>
Date:   Mon Oct 8 13:39:46 2012 -0700

    am 58c0059a: am e2068c92: libcamera2: Clean up scary looking dequeue_request returned NULL log message.

    * commit '58c0059aa8b31b2632bdb03dd75a64e4c054966e':
      libcamera2: Clean up scary looking dequeue_request returned NULL log message.

commit 58c0059aa8b31b2632bdb03dd75a64e4c054966e
Merge: af3c8ec e2068c9
Author: Igor Murashkin <iam@google.com>
Date:   Mon Oct 8 13:38:16 2012 -0700

    am e2068c92: libcamera2: Clean up scary looking dequeue_request returned NULL log message.

    * commit 'e2068c92d6c78d481b5ace3b50ef3e999952a050':
      libcamera2: Clean up scary looking dequeue_request returned NULL log message.

commit 0a9df89c350137af440a08ce858b08e0af303f24
Merge: 43d25a2 af3c8ec
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 8 10:57:22 2012 -0700

    am af3c8ecb: am 4cc86ec1: gralloc: pad RGB buffers by a minimum of 2 extra lines

    * commit 'af3c8ecb63c1cf4f97f4849715ed34a958984c2d':
      gralloc: pad RGB buffers by a minimum of 2 extra lines

commit af3c8ecb63c1cf4f97f4849715ed34a958984c2d
Merge: 9309509 4cc86ec
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 8 10:47:59 2012 -0700

    am 4cc86ec1: gralloc: pad RGB buffers by a minimum of 2 extra lines

    * commit '4cc86ec14bdd6f9adf34b1fd7829041a5e4b84a0':
      gralloc: pad RGB buffers by a minimum of 2 extra lines

commit 43d25a2d427c82d1db7c30c351d57f7dba8e7477
Merge: 81e794b 9309509
Author: Benoit Goby <benoit@android.com>
Date:   Sun Oct 7 23:25:56 2012 -0700

    am 93095097: am 3ac75816: Merge "hwc: Use sync fences with m2m gscalers" into jb-mr1-dev

    * commit '930950971d946b2829c6d9e4c57d66255f016c78':
      hwc: Use sync fences with m2m gscalers

commit 81e794bd63978e2019486baff22bd19b8937ba83
Merge: 36f0a6b ee960eb
Author: Benoit Goby <benoit@android.com>
Date:   Sun Oct 7 23:25:55 2012 -0700

    am ee960eb8: am 2badde50: Merge "libgscaler: Add support for sync fences" into jb-mr1-dev

    * commit 'ee960eb8690965405d9c884aedabefa7d568961b':
      libgscaler: Add support for sync fences

commit 930950971d946b2829c6d9e4c57d66255f016c78
Merge: ee960eb 3ac7581
Author: Benoit Goby <benoit@android.com>
Date:   Sun Oct 7 23:23:01 2012 -0700

    am 3ac75816: Merge "hwc: Use sync fences with m2m gscalers" into jb-mr1-dev

    * commit '3ac758164b6b49e433191a13160e0918352ca7c8':
      hwc: Use sync fences with m2m gscalers

commit ee960eb8690965405d9c884aedabefa7d568961b
Merge: 408453f 2badde5
Author: Benoit Goby <benoit@android.com>
Date:   Sun Oct 7 23:23:00 2012 -0700

    am 2badde50: Merge "libgscaler: Add support for sync fences" into jb-mr1-dev

    * commit '2badde506768f298b65f103bb369b5ecba97bae0':
      libgscaler: Add support for sync fences

commit 36f0a6bfd5ecb2752d77a6eb55d67b1cdad45f77
Merge: b2162e0 408453f
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Sun Oct 7 13:12:46 2012 -0700

    am 408453f6: am 7ef20f42: hardware: samsung_slsi: libcamera2: Enable 3DNR

    * commit '408453f680eb4d8fd1e76d29e72b135525826ad4':
      hardware: samsung_slsi: libcamera2: Enable 3DNR

commit 408453f680eb4d8fd1e76d29e72b135525826ad4
Merge: d8b4402 7ef20f4
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Sun Oct 7 13:11:07 2012 -0700

    am 7ef20f42: hardware: samsung_slsi: libcamera2: Enable 3DNR

    * commit '7ef20f42c74628187c84332b39f18f272b265c6d':
      hardware: samsung_slsi: libcamera2: Enable 3DNR

commit b2162e01ad96f8a3b8e9553bb09da9e6ee16f23e
Merge: 1d676ac d8b4402
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Fri Oct 5 16:43:43 2012 -0700

    am d8b4402b: am ddf663f8: hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)

    * commit 'd8b4402b2eda70d8f47c3ec3c13954ca77554b2b':
      hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)

commit 1d676acb3d9a4f74334eba9a421a1167bce1696d
Merge: 0f34491 87a2bf8
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Oct 5 16:43:42 2012 -0700

    am 87a2bf81: am ca31bf21: hardware: samsung_slsi: libcamera2: Supports AE region

    * commit '87a2bf81315d18dfc897b49cba4398dbfe5aef6d':
      hardware: samsung_slsi: libcamera2: Supports AE region

commit 0f34491aeddfc41f06968c2a4c756e26096257e3
Merge: 0e47355 8deec2b
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Oct 5 16:43:41 2012 -0700

    am 8deec2b9: am 6caa0c80: hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error

    * commit '8deec2b90f8e09564f785d1e1a3ab0307b62eb10':
      hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error

commit 0e4735517a8eb8b40bef3f660b75979f73662d3c
Merge: 98ad036 816f8ce
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Fri Oct 5 16:43:40 2012 -0700

    am 816f8ce5: am 87423e56: hardware: samsung_slsi: libcamera2: Support JPEG quality

    * commit '816f8ce55f82f9b7a5ff9c3a23d57384d63da7df':
      hardware: samsung_slsi: libcamera2: Support JPEG quality

commit 98ad036c0d382fc8b8e1cfbab22b92a138558009
Merge: 7ba7678 a2d075b
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Oct 5 16:43:40 2012 -0700

    am a2d075ba: am 71f3bb38: hardware: samsung_slsi: libcamera2: Fix screen blinking on start

    * commit 'a2d075ba2b5339346808161d1a35c935e6ec3ccf':
      hardware: samsung_slsi: libcamera2: Fix screen blinking on start

commit 7ba76781d5ccaf94857b01c6670dbaef4665cd0b
Merge: 7df4cb0 9b033d0
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Oct 5 16:43:39 2012 -0700

    am 9b033d02: am 0066b2cb: hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates

    * commit '9b033d02f7dc0511d6e9dc95fe329221033022fd':
      hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates

commit d8b4402b2eda70d8f47c3ec3c13954ca77554b2b
Merge: 87a2bf8 ddf663f
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Fri Oct 5 16:41:57 2012 -0700

    am ddf663f8: hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)

    * commit 'ddf663f88ed7c4729a55a0b4519b2138adf154de':
      hardware: samsung_slsi: libcamera2: make sync between pre and main flash(2)

commit 87a2bf81315d18dfc897b49cba4398dbfe5aef6d
Merge: 8deec2b ca31bf2
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Oct 5 16:41:56 2012 -0700

    am ca31bf21: hardware: samsung_slsi: libcamera2: Supports AE region

    * commit 'ca31bf2185d8b0550733c1b60278cda076a17a77':
      hardware: samsung_slsi: libcamera2: Supports AE region

commit 8deec2b90f8e09564f785d1e1a3ab0307b62eb10
Merge: 816f8ce 6caa0c8
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Oct 5 16:41:56 2012 -0700

    am 6caa0c80: hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error

    * commit '6caa0c805ef028707af71cb84b6ab11aee67abb5':
      hardware: samsung_slsi: libcamera2: Fix CAF to AF transition error

commit 816f8ce55f82f9b7a5ff9c3a23d57384d63da7df
Merge: a2d075b 87423e5
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Fri Oct 5 16:41:55 2012 -0700

    am 87423e56: hardware: samsung_slsi: libcamera2: Support JPEG quality

    * commit '87423e5686296b1938959ff8bf9817490ddee2f1':
      hardware: samsung_slsi: libcamera2: Support JPEG quality

commit a2d075ba2b5339346808161d1a35c935e6ec3ccf
Merge: 9b033d0 71f3bb3
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Oct 5 16:41:54 2012 -0700

    am 71f3bb38: hardware: samsung_slsi: libcamera2: Fix screen blinking on start

    * commit '71f3bb3840977f3339733a6945927f0f70758731':
      hardware: samsung_slsi: libcamera2: Fix screen blinking on start

commit 9b033d02f7dc0511d6e9dc95fe329221033022fd
Merge: 99a9a1c 0066b2c
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Oct 5 16:41:53 2012 -0700

    am 0066b2cb: hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates

    * commit '0066b2cb831c1a4e20edd7339cc1bc790e0d968c':
      hardware: samsung_slsi: libcamera2: Fix JPEG GPS Coordinates

commit 7df4cb0f3d127bfb05df7e4a27195efa4fbc7b8d
Merge: 6ef1f77 99a9a1c
Author: Igor Murashkin <iam@google.com>
Date:   Fri Oct 5 13:52:36 2012 -0700

    am 99a9a1cf: am faa88263: Merge "hardware: samsung_slsi: libcamera2: Correct front and rear camera info" into jb-mr1-dev

    * commit '99a9a1cff3238bd72da21292801468f7d5d7dfb8':
      hardware: samsung_slsi: libcamera2: Correct front and rear camera info

commit 99a9a1cff3238bd72da21292801468f7d5d7dfb8
Merge: 8d0c79e faa8826
Author: Igor Murashkin <iam@google.com>
Date:   Fri Oct 5 13:49:52 2012 -0700

    am faa88263: Merge "hardware: samsung_slsi: libcamera2: Correct front and rear camera info" into jb-mr1-dev

    * commit 'faa88263bc466e2a064e3968ba290f8f16882e98':
      hardware: samsung_slsi: libcamera2: Correct front and rear camera info

commit 6ef1f77da2cbe9802becf8812387ebfd826b0551
Merge: 0ad7ac0 8d0c79e
Author: Sanghee Kim <haya93@samsung.com>
Date:   Fri Oct 5 10:24:21 2012 -0700

    am 8d0c79ee: am 7b4c1329: hardware: exynos5: hwc: add gsc\'s width alignment constraint.

    * commit '8d0c79ee29cda5c3a1f0b0ef682e9c1ecb1c1388':
      hardware: exynos5: hwc: add gsc's width alignment constraint.

commit 8d0c79ee29cda5c3a1f0b0ef682e9c1ecb1c1388
Merge: 3e2096a 7b4c132
Author: Sanghee Kim <haya93@samsung.com>
Date:   Fri Oct 5 10:22:39 2012 -0700

    am 7b4c1329: hardware: exynos5: hwc: add gsc\'s width alignment constraint.

    * commit '7b4c1329920d7c9a804f70cca33285ed60ad284b':
      hardware: exynos5: hwc: add gsc's width alignment constraint.

commit 0ad7ac00251765b54ead43b1f49d23dd0f714640
Merge: 2c31135 3e2096a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 5 08:20:33 2012 -0700

    am 3e2096a7: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '3e2096a78b28ddf3068dafebcefb448a933a5d14':

commit 3e2096a78b28ddf3068dafebcefb448a933a5d14
Merge: 356efb5 f5cffcd
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Oct 5 08:17:07 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Iff019a3d002fa30cab129b77dc2f1d1ab2f162ba

commit 2c311356903eba0eebbf742f08969ce0860ef65d
Merge: 06b8403 356efb5
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Oct 4 14:52:47 2012 -0700

    am 356efb56: am 89bb5743: hwc: don\'t logspam about unexpected formats

    * commit '356efb566bd50e80fe79c88d1565bf73c361fbd9':
      hwc: don't logspam about unexpected formats

commit 356efb566bd50e80fe79c88d1565bf73c361fbd9
Merge: 03cc945 89bb574
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Oct 4 14:50:46 2012 -0700

    am 89bb5743: hwc: don\'t logspam about unexpected formats

    * commit '89bb5743fcbcf78bbc517e5bd690de3996981fd4':
      hwc: don't logspam about unexpected formats

commit 06b8403e7d2ba0bdaa27ac459e3001f47c5f531b
Merge: 52365be 03cc945
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Oct 4 12:28:32 2012 -0700

    am 03cc9455: am 5258c21c: Fix bug in gralloc

    * commit '03cc945508b8f720b3c196a84804bf2cac7a659c':
      Fix bug in gralloc

commit 03cc945508b8f720b3c196a84804bf2cac7a659c
Merge: ec5c13b 5258c21
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Oct 4 11:42:25 2012 -0700

    am 5258c21c: Fix bug in gralloc

    * commit '5258c21c1bdeb412c4ad7982d95e587a121f00fc':
      Fix bug in gralloc

commit 52365be30d2cb8489bc32712ea8a6a4dc6359502
Merge: 4cb7437 ec5c13b
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Oct 4 11:20:21 2012 -0700

    am ec5c13bd: am fdf73d2f: Merge changes I28fc9f33,I7594e39e,I831e4839 into jb-mr1-dev

    * commit 'ec5c13bdca77964be9f6a0622a8f76e3fa54cb0e':
      hwc: keep gscaler streaming on between frames
      libgscaler: don't reconfigure m2m gscaler every frame
      libgscaler: split stop operation into discrete wait and stop operations

commit ec5c13bdca77964be9f6a0622a8f76e3fa54cb0e
Merge: a1fa118 fdf73d2
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Oct 4 11:18:44 2012 -0700

    am fdf73d2f: Merge changes I28fc9f33,I7594e39e,I831e4839 into jb-mr1-dev

    * commit 'fdf73d2f9ff2aad79d827b95f99f57538d7fde3d':
      hwc: keep gscaler streaming on between frames
      libgscaler: don't reconfigure m2m gscaler every frame
      libgscaler: split stop operation into discrete wait and stop operations

commit 4cb7437f94a457867c0f255cdf60b3519f96a658
Merge: ce586dd a1fa118
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 4 07:52:20 2012 -0700

    am a1fa1181: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'a1fa118111c0750b469153ba004ceb2d0081ceb5':
      hardware: samsung_slsi: libcamera2: increase meta length and remove dead code
      hwc: Fix video layer colors
      hwc: Add support for video overlay

commit a1fa118111c0750b469153ba004ceb2d0081ceb5
Merge: a0d57f4 db91191
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Oct 4 07:48:44 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ia42f0b7dd97e46cfa521b1f57a3635a42464e1a9

commit ce586dd92eb5e3ff443d361dce152d66e213921b
Merge: 4aafde8 a0d57f4
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Oct 3 23:58:59 2012 -0700

    am a0d57f48: am 1aebf6df: hardware: samsung_slsi: libcamera2: Change FD filtering method

    * commit 'a0d57f48f12c331e60e0573c55a514a0eba4cc08':
      hardware: samsung_slsi: libcamera2: Change FD filtering method

commit 4aafde8255b7032c149f5638509f214c1a88108d
Merge: a683165 7d1a32f
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Oct 3 23:58:58 2012 -0700

    am 7d1a32f6: am cdd53a9f: hardware: samsung_slsi: libcamera2: make sync between pre and main flash

    * commit '7d1a32f65f620dcb82751e24da09ff12c9e6697d':
      hardware: samsung_slsi: libcamera2: make sync between pre and main flash

commit a6831659f37430111ef388ebd56f77da172fe1d5
Merge: 9066639 1c8f516
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Oct 3 23:58:57 2012 -0700

    am 1c8f5163: am 408f6161: hardware: samsung_slsi: libcamera2: Fixed crop region mismatch

    * commit '1c8f51638635052e4d54db8e66a332d4f98e0bee':
      hardware: samsung_slsi: libcamera2: Fixed crop region mismatch

commit 9066639a6f082e936de9582e2e8dbaa4383c64ac
Merge: 6c745ab 25d9bc8
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Oct 3 23:58:57 2012 -0700

    am 25d9bc8a: am ce77365b: hardware: samsung_slsi: libcamera2: VDIS disable bug fix

    * commit '25d9bc8aef93c36c781a45af58604e257df1943c':
      hardware: samsung_slsi: libcamera2: VDIS disable bug fix

commit a0d57f48f12c331e60e0573c55a514a0eba4cc08
Merge: 7d1a32f 1aebf6d
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Oct 3 23:56:48 2012 -0700

    am 1aebf6df: hardware: samsung_slsi: libcamera2: Change FD filtering method

    * commit '1aebf6df3e4ec3b3487da96797a742dc14bf355a':
      hardware: samsung_slsi: libcamera2: Change FD filtering method

commit 7d1a32f65f620dcb82751e24da09ff12c9e6697d
Merge: 1c8f516 cdd53a9
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Oct 3 23:56:47 2012 -0700

    am cdd53a9f: hardware: samsung_slsi: libcamera2: make sync between pre and main flash

    * commit 'cdd53a9f3bfbd35a715b9fe56ff7e3e1c3e32a10':
      hardware: samsung_slsi: libcamera2: make sync between pre and main flash

commit 1c8f51638635052e4d54db8e66a332d4f98e0bee
Merge: 25d9bc8 408f616
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Oct 3 23:56:46 2012 -0700

    am 408f6161: hardware: samsung_slsi: libcamera2: Fixed crop region mismatch

    * commit '408f6161d88b5b03fbce875a7662b59942851d6c':
      hardware: samsung_slsi: libcamera2: Fixed crop region mismatch

commit 25d9bc8aef93c36c781a45af58604e257df1943c
Merge: 2be6441 ce77365
Author: Hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Oct 3 23:56:46 2012 -0700

    am ce77365b: hardware: samsung_slsi: libcamera2: VDIS disable bug fix

    * commit 'ce77365bcdde50b2be626f3db1bf2cd77f2ef715':
      hardware: samsung_slsi: libcamera2: VDIS disable bug fix

commit 6c745abe6bdbef3c51d4b9c85d5c11b2c6f2420f
Merge: 715bb74 2be6441
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 3 22:54:16 2012 -0700

    am 2be6441c: am d0a2bb69: hardware: samsung_slsi: libcamera2: Protection from re-releasing stream

    * commit '2be6441c61e8ab0a1667e7b68111d8ae4483c03b':
      hardware: samsung_slsi: libcamera2: Protection from re-releasing stream

commit 715bb740ccd12fa0e4f690b0198cde5ac001a802
Merge: 7db2e2d 0c49dbe
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 3 22:54:15 2012 -0700

    am 0c49dbea: am 69d1e6e9: hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF

    * commit '0c49dbeac7cd4f85395832b79946bd3b54bfa224':
      hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF

commit 7db2e2dcf9b8c6ad48bd3c88a1a4a83a4907b27b
Merge: 3aeb8fd 04eb445
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 3 22:54:14 2012 -0700

    am 04eb445d: am 572470e2: hardware: samsung_slsi: libcamera2: Fix black frame after night shot

    * commit '04eb445ddb71bc7aacbb9c0e7c181c2304b49862':
      hardware: samsung_slsi: libcamera2: Fix black frame after night shot

commit 2be6441c61e8ab0a1667e7b68111d8ae4483c03b
Merge: 0c49dbe d0a2bb6
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 3 22:52:03 2012 -0700

    am d0a2bb69: hardware: samsung_slsi: libcamera2: Protection from re-releasing stream

    * commit 'd0a2bb696153f2a6e6cadd6ec177c244aac0009c':
      hardware: samsung_slsi: libcamera2: Protection from re-releasing stream

commit 0c49dbeac7cd4f85395832b79946bd3b54bfa224
Merge: 04eb445 69d1e6e
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 3 22:52:02 2012 -0700

    am 69d1e6e9: hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF

    * commit '69d1e6e9c2036cc231544f61df9ee13e00d1fe0c':
      hardware: samsung_slsi: libcamera2: Fix missing fields in EXIF

commit 04eb445ddb71bc7aacbb9c0e7c181c2304b49862
Merge: 0104260 572470e
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 3 22:52:01 2012 -0700

    am 572470e2: hardware: samsung_slsi: libcamera2: Fix black frame after night shot

    * commit '572470e2f220641581282c0d3f199a0faa52f8b7':
      hardware: samsung_slsi: libcamera2: Fix black frame after night shot

commit 3aeb8fd496dd6aeb7b05bf43742a77568e8a0e64
Merge: 3652369 0104260
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Oct 3 22:09:44 2012 -0700

    am 01042604: am e9b42242: Merge "Don\'t map gralloc buffers when you allocate them" into jb-mr1-dev

    * commit '010426049f747df65e86dcc9be4a0838fe920380':
      Don't map gralloc buffers when you allocate them

commit 010426049f747df65e86dcc9be4a0838fe920380
Merge: 68fed6e e9b4224
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Oct 3 22:07:33 2012 -0700

    am e9b42242: Merge "Don\'t map gralloc buffers when you allocate them" into jb-mr1-dev

    * commit 'e9b4224251748a74f2d1aebbe9a5b71d6e964158':
      Don't map gralloc buffers when you allocate them

commit 365236996dcba6202a5e3d6614029498770a1201
Merge: a1d1dbb 68fed6e
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 3 21:41:13 2012 -0700

    am 68fed6e1: am c6053426: hardware: samsung_slsi: libcamera2: Use quirk for metering regions

    * commit '68fed6e17ca5e5d801d431877268cae1b3244bba':
      hardware: samsung_slsi: libcamera2: Use quirk for metering regions

commit 68fed6e17ca5e5d801d431877268cae1b3244bba
Merge: 58ec428 c605342
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Oct 3 21:39:24 2012 -0700

    am c6053426: hardware: samsung_slsi: libcamera2: Use quirk for metering regions

    * commit 'c6053426696191056192ff8ed0218b81fb246a00':
      hardware: samsung_slsi: libcamera2: Use quirk for metering regions

commit a1d1dbbb32759f6b915fc30b77fb634c8f802630
Merge: 2185ffe 58ec428
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Oct 3 14:32:47 2012 -0700

    am 58ec4288: am 07b3ad1c: hardware: samsung_slsi: libcamera2: increase meta length and remove dead code

    * commit '58ec42887319680cda866983c5f5eae9917d12e5':
      hardware: samsung_slsi: libcamera2: increase meta length and remove dead code

commit 58ec42887319680cda866983c5f5eae9917d12e5
Merge: 7d5a637 07b3ad1
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Oct 3 14:31:11 2012 -0700

    am 07b3ad1c: hardware: samsung_slsi: libcamera2: increase meta length and remove dead code

    * commit '07b3ad1ceb45ecff82e1ab272e686243856aa841':
      hardware: samsung_slsi: libcamera2: increase meta length and remove dead code

commit 2185ffe433dc37ed15d87954beb5989987591982
Merge: 7e98b12 7d5a637
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Oct 3 14:02:41 2012 -0700

    am 7d5a6376: am efd9853a: hwc: reuse gscaler device between frames

    * commit '7d5a6376b5ed0c546e911b8933bc666f3d2929c6':
      hwc: reuse gscaler device between frames

commit 7e98b120a4f7440f27f758ce3bf9f7c75d40c9e9
Merge: 87cb7c6 26c5365
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Oct 3 14:02:40 2012 -0700

    am 26c5365a: am d6743822: hwc: reserve one gscaler each for FIMD and HDMI

    * commit '26c5365a2d8bb83c413cc1ad8a7ed681fd36d485':
      hwc: reserve one gscaler each for FIMD and HDMI

commit 87cb7c6c4da6e1e3ff8934d500b6789888eda09e
Merge: 3239c8f 79cd371
Author: Benoit Goby <benoit@android.com>
Date:   Wed Oct 3 14:02:39 2012 -0700

    am 79cd371f: am 59acf952: Merge "hwc: Fix video layer colors" into jb-mr1-dev

    * commit '79cd371f25cf1bd43e8717ab00af7dda07aa8797':
      hwc: Fix video layer colors

commit 3239c8fd61c499b28c0e129fcf1c3ae0ebd857bf
Merge: 461e210 d1b93b3
Author: Benoit Goby <benoit@android.com>
Date:   Wed Oct 3 14:02:38 2012 -0700

    am d1b93b30: am 60b9fbf3: Merge "hwc: Add support for video overlay" into jb-mr1-dev

    * commit 'd1b93b30fe4a6e0e73b02ed7c645bde369654f44':
      hwc: Add support for video overlay

commit 7d5a6376b5ed0c546e911b8933bc666f3d2929c6
Merge: 26c5365 efd9853
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Oct 3 13:54:15 2012 -0700

    am efd9853a: hwc: reuse gscaler device between frames

    * commit 'efd9853a27a57c13b90fd9c2871aea206d4d6338':
      hwc: reuse gscaler device between frames

commit 26c5365a2d8bb83c413cc1ad8a7ed681fd36d485
Merge: 79cd371 d674382
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Oct 3 13:54:14 2012 -0700

    am d6743822: hwc: reserve one gscaler each for FIMD and HDMI

    * commit 'd6743822496f732019c4c16db81e443598763500':
      hwc: reserve one gscaler each for FIMD and HDMI

commit 79cd371f25cf1bd43e8717ab00af7dda07aa8797
Merge: d1b93b3 59acf95
Author: Benoit Goby <benoit@android.com>
Date:   Wed Oct 3 13:53:55 2012 -0700

    am 59acf952: Merge "hwc: Fix video layer colors" into jb-mr1-dev

    * commit '59acf952ddeccfd1a8a4d2c102a4fa3bbd87ead4':
      hwc: Fix video layer colors

commit d1b93b30fe4a6e0e73b02ed7c645bde369654f44
Merge: 6763d22 60b9fbf
Author: Benoit Goby <benoit@android.com>
Date:   Wed Oct 3 13:53:55 2012 -0700

    am 60b9fbf3: Merge "hwc: Add support for video overlay" into jb-mr1-dev

    * commit '60b9fbf32e6a87190b2d6d64f65eb29a8e6775c1':
      hwc: Add support for video overlay

commit 461e210a38ff20aea30e63d7d7238d2c73629f3a
Merge: 566529c 6763d22
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Oct 3 11:56:46 2012 -0700

    am 6763d22e: am 6155ddde: Merge "hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks" into jb-mr1-dev

    * commit '6763d22e8d424e065a1025d1f1ae88f36e549863':
      hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks

commit 6763d22e8d424e065a1025d1f1ae88f36e549863
Merge: f42521f 6155ddd
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Oct 3 11:51:31 2012 -0700

    am 6155ddde: Merge "hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks" into jb-mr1-dev

    * commit '6155dddeee557b63e25619719acb460044a22660':
      hardware: samsung_slsi: libcamera2: Supports scene mode override and quirks

commit 566529c5983a700f93f375b162de065f3517db0b
Merge: 3c5537a f42521f
Author: Simon Wilson <simonwilson@google.com>
Date:   Wed Oct 3 11:08:52 2012 -0700

    am f42521fb: am c03533ba: clean kernel headers

    * commit 'f42521fb1c3335a7dd2403f14b2275b98591a4eb':
      clean kernel headers

commit f42521fb1c3335a7dd2403f14b2275b98591a4eb
Merge: bdbc067 c03533b
Author: Simon Wilson <simonwilson@google.com>
Date:   Wed Oct 3 11:06:34 2012 -0700

    am c03533ba: clean kernel headers

    * commit 'c03533ba4afd2c884dd936b127e31e76b0b1d9e3':
      clean kernel headers

commit 3c5537a9eee17c2b8b272efeb048d4e088de08cb
Merge: 9e6185f bdbc067
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 3 07:36:28 2012 -0700

    am bdbc0676: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'bdbc067685bf527617f5e6d7643ef5836d28655f':

commit bdbc067685bf527617f5e6d7643ef5836d28655f
Merge: 0be79ed 36b1ce5
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Oct 3 07:34:29 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib5e744d8e5e05f06065f7650ac51590af9ad2a9e

commit 9e6185f2f32d1fa7cd8fc87472ec2da967085f00
Merge: ed2bccf 0be79ed
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Oct 2 10:55:11 2012 -0700

    am 0be79edc: am cf593314: hardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header

    * commit '0be79edc94ce774a83506d3b404c9df82302c12a':
      hardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header

commit 0be79edc94ce774a83506d3b404c9df82302c12a
Merge: dbea172 cf59331
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Oct 2 10:53:17 2012 -0700

    am cf593314: hardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header

    * commit 'cf59331416573a0c9c1f2b925b7531e1e635b322':
      hardware: samsung_slsi: libcamera2: Fix misplacing JPEG Transport header

commit ed2bccf79a1b5f9393f149b501b18f2b7e6ea364
Merge: 48e01da dbea172
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:24:23 2012 -0700

    am dbea1726: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'dbea1726ec364636312340de940c5f80c34ec1d8':
      mobicore: remove useless kernel header
      exynos: mobicore: update Mobicore userspace daemon and libraries

commit dbea1726ec364636312340de940c5f80c34ec1d8
Merge: 7c01bc1 bc5ac35
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Oct 2 09:19:05 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I0d505138d8787065c448c5d3d5523a21329c6e90

commit 48e01daaf8d0938826a6111c3d8a3b8f662806b7
Merge: b7670e6 7c01bc1
Author: Benoit Goby <benoit@android.com>
Date:   Mon Oct 1 23:35:34 2012 -0700

    am 7c01bc1c: am 93f9f5db: hwc: Use graphic layer and no gscaler for FB TARGET

    * commit '7c01bc1c04e4e7af151aea542331e7556dd6f585':
      hwc: Use graphic layer and no gscaler for FB TARGET

commit 7c01bc1c04e4e7af151aea542331e7556dd6f585
Merge: 1d7373e 93f9f5d
Author: Benoit Goby <benoit@android.com>
Date:   Mon Oct 1 23:33:17 2012 -0700

    am 93f9f5db: hwc: Use graphic layer and no gscaler for FB TARGET

    * commit '93f9f5db1b8ed79cac5abb62544f59c04fd49252':
      hwc: Use graphic layer and no gscaler for FB TARGET

commit b7670e6a0fd15f28d1626dc5be71150099c2d221
Merge: 56a5974 1d7373e
Author: Rebecca Zavin <rebecca@android.com>
Date:   Mon Oct 1 15:46:48 2012 -0700

    am 1d7373eb: am 995bbd51: Merge "hardware: samsung_slsi: libcamera2: AE lock bug fix" into jb-mr1-dev

    * commit '1d7373eb6c8bf044aae23916fc65879f79a0f53d':
      hardware: samsung_slsi: libcamera2: AE lock bug fix

commit 1d7373eb6c8bf044aae23916fc65879f79a0f53d
Merge: f6d1d9a 995bbd5
Author: Rebecca Zavin <rebecca@android.com>
Date:   Mon Oct 1 15:44:25 2012 -0700

    am 995bbd51: Merge "hardware: samsung_slsi: libcamera2: AE lock bug fix" into jb-mr1-dev

    * commit '995bbd512ac29912894158067e3fc44d3ceb000a':
      hardware: samsung_slsi: libcamera2: AE lock bug fix

commit 56a5974f65bcb867e971c5e0f5773d13e81ccc1c
Merge: d58042d f6d1d9a
Author: Rebecca Zavin <rebecca@android.com>
Date:   Mon Oct 1 15:41:51 2012 -0700

    am f6d1d9a9: am 58163f20: Merge "hardware: samsung_slsi: libcamera2: Modify FPS range static metadata" into jb-mr1-dev

    * commit 'f6d1d9a90a08c667c760df8dbe889acb031cfe3a':
      hardware: samsung_slsi: libcamera2: Modify FPS range static metadata

commit d58042dde2727c399d21fbd8d0d9e3a2eec47084
Merge: b3a480e 2d3e988
Author: Rebecca Zavin <rebecca@android.com>
Date:   Mon Oct 1 15:41:46 2012 -0700

    am 2d3e9886: am 7ccc361c: Merge "hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment" into jb-mr1-dev

    * commit '2d3e9886d40f00a458d5774c6de0f646f38cf864':
      hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment

commit f6d1d9a90a08c667c760df8dbe889acb031cfe3a
Merge: 2d3e988 58163f2
Author: Rebecca Zavin <rebecca@android.com>
Date:   Mon Oct 1 15:39:24 2012 -0700

    am 58163f20: Merge "hardware: samsung_slsi: libcamera2: Modify FPS range static metadata" into jb-mr1-dev

    * commit '58163f20cc1e26ff228cd0ffc00e15182a1c7bab':
      hardware: samsung_slsi: libcamera2: Modify FPS range static metadata

commit 2d3e9886d40f00a458d5774c6de0f646f38cf864
Merge: 1dbdb0e 7ccc361
Author: Rebecca Zavin <rebecca@android.com>
Date:   Mon Oct 1 15:39:24 2012 -0700

    am 7ccc361c: Merge "hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment" into jb-mr1-dev

    * commit '7ccc361c5a191050a4d0be8b608fa2e72e525e63':
      hardware: samsung_slsi: libcamera2: Fix Android YV12 Alignment

commit b3a480e3062821e50256876751d5a59b942143a3
Merge: 8200061 1dbdb0e
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 1 14:42:36 2012 -0700

    am 1dbdb0e8: am 2932ace3: Merge "hwc: enforce minimum window width" into jb-mr1-dev

    * commit '1dbdb0e839be755195c8ba9f965024ae04e180ce':
      hwc: enforce minimum window width

commit 1dbdb0e839be755195c8ba9f965024ae04e180ce
Merge: eda0776 2932ace
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 1 14:40:25 2012 -0700

    am 2932ace3: Merge "hwc: enforce minimum window width" into jb-mr1-dev

    * commit '2932ace329799c757b25a8d703b2cfa12ff73bca':
      hwc: enforce minimum window width

commit 8200061f7e8e3d8ba20974e2d9960e8ca1e3048b
Merge: 2177621 eda0776
Author: Seho Kim <sh1645.kim@samsung.com>
Date:   Mon Oct 1 14:29:20 2012 -0700

    am eda0776c: am 6cc676b4: gralloc: change align of stride for EXYNOS_YV12

    * commit 'eda0776c94a7732e1ce1773ddb3b118c2d40bd84':
      gralloc: change align of stride for EXYNOS_YV12

commit eda0776c94a7732e1ce1773ddb3b118c2d40bd84
Merge: 89699cd 6cc676b
Author: Seho Kim <sh1645.kim@samsung.com>
Date:   Mon Oct 1 14:27:50 2012 -0700

    am 6cc676b4: gralloc: change align of stride for EXYNOS_YV12

    * commit '6cc676b447554079d90b048c1b5bcf4130f2f434':
      gralloc: change align of stride for EXYNOS_YV12

commit 2177621f3e2e3defa89c255482fe80524e91163a
Merge: 9d8f9aa 89699cd
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 1 13:47:40 2012 -0700

    am 89699cd7: am c06b3290: hardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL

    * commit '89699cd7726a242223424722108b71a58a250d99':
      hardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL

commit 9d8f9aae20222c91bdb1bdd22592dc08d29bf85d
Merge: 2893b22 34ef240
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 1 13:47:39 2012 -0700

    am 34ef2406: am 14dce02c: hardware: samsung_slsi: libcamera2: Fix AE state for night mode

    * commit '34ef2406e84b51f1047568df56ff31d24c7da67e':
      hardware: samsung_slsi: libcamera2: Fix AE state for night mode

commit 2893b225077169dae327b6ead08d0c8fd8a6aac1
Merge: fed5f67 1dc6a3f
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 1 13:47:38 2012 -0700

    am 1dc6a3fe: am 48728d49: hardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL

    * commit '1dc6a3fee5806142a00beeefe111a199bfedf4bd':
      hardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL

commit fed5f673276ce24523cdb0ee05bbbe7b3987ac97
Merge: 51a1803 1d21c0b
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Oct 1 13:47:37 2012 -0700

    am 1d21c0ba: am 40acdcc8: hardware: samsung_slsi: libcamera2: AF stalling bug fix

    * commit '1d21c0ba69028cb1907a2d7a81f12561ef6872d3':
      hardware: samsung_slsi: libcamera2: AF stalling bug fix

commit 51a180369aa5d3efb52449b989fc78fd91f4102d
Merge: 9f41dac e64d4f3
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 1 13:47:37 2012 -0700

    am e64d4f3b: am 83bc2903: hardware: samsung_slsi: libcamera2: Supports FPS range metadata

    * commit 'e64d4f3bbf566f3f45048315fa0cb60746a714c2':
      hardware: samsung_slsi: libcamera2: Supports FPS range metadata

commit 9f41dac60dce5e631d616952c1061276dfd35f3d
Merge: 164f4d7 28268c9
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 1 13:45:17 2012 -0700

    am 28268c95: am a46f3ffc: hwc: fix gscaler color order for 565 surfaces

    * commit '28268c95ea6ed3a9e48b6ab518bcae84d41f21d1':
      hwc: fix gscaler color order for 565 surfaces

commit 164f4d77620bf76244d2ed7986cdec559da8c858
Merge: b94f5f2 ebd00d5
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 1 13:45:16 2012 -0700

    am ebd00d5b: am 644919a6: Merge "hwc: switch HDMI gscaler input to RGBX" into jb-mr1-dev

    * commit 'ebd00d5b013441ac7f33da4d688cb2d02e1d7406':
      hwc: switch HDMI gscaler input to RGBX

commit 89699cd7726a242223424722108b71a58a250d99
Merge: 34ef240 c06b329
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 1 10:52:00 2012 -0700

    am c06b3290: hardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL

    * commit 'c06b3290c7fa7d6138cf3b3dcb3280d4eeac5dce':
      hardware: samsung_slsi: libcamera2: Use new JPEG transport header in HAL

commit 34ef2406e84b51f1047568df56ff31d24c7da67e
Merge: 1dc6a3f 14dce02
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 1 10:51:59 2012 -0700

    am 14dce02c: hardware: samsung_slsi: libcamera2: Fix AE state for night mode

    * commit '14dce02c7c8fdc2a9f2a83ed285ea9a79c75089b':
      hardware: samsung_slsi: libcamera2: Fix AE state for night mode

commit 1dc6a3fee5806142a00beeefe111a199bfedf4bd
Merge: 1d21c0b 48728d4
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 1 10:51:58 2012 -0700

    am 48728d49: hardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL

    * commit '48728d495b8aa54d3c6cc95229f49f3135107aec':
      hardware: samsung_slsi: libcamera2: Fix AWB metadata error with ZSL

commit 1d21c0ba69028cb1907a2d7a81f12561ef6872d3
Merge: e64d4f3 40acdcc
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Oct 1 10:51:57 2012 -0700

    am 40acdcc8: hardware: samsung_slsi: libcamera2: AF stalling bug fix

    * commit '40acdcc8c7ac1b9c28e4c8ed97598dbfc35a2658':
      hardware: samsung_slsi: libcamera2: AF stalling bug fix

commit e64d4f3bbf566f3f45048315fa0cb60746a714c2
Merge: 28268c9 83bc290
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Oct 1 10:51:57 2012 -0700

    am 83bc2903: hardware: samsung_slsi: libcamera2: Supports FPS range metadata

    * commit '83bc29031b8fbc600f8907128e5ea626194ab045':
      hardware: samsung_slsi: libcamera2: Supports FPS range metadata

commit 28268c95ea6ed3a9e48b6ab518bcae84d41f21d1
Merge: ebd00d5 a46f3ff
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 1 10:15:55 2012 -0700

    am a46f3ffc: hwc: fix gscaler color order for 565 surfaces

    * commit 'a46f3ffc8589d99c6273ada37c90d6fcf68be70b':
      hwc: fix gscaler color order for 565 surfaces

commit ebd00d5b013441ac7f33da4d688cb2d02e1d7406
Merge: 98df800 644919a
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Oct 1 10:14:24 2012 -0700

    am 644919a6: Merge "hwc: switch HDMI gscaler input to RGBX" into jb-mr1-dev

    * commit '644919a60f73c39d49db3d46390362aab9abc86c':
      hwc: switch HDMI gscaler input to RGBX

commit b94f5f2aa2c3a60672c67bdb02c26515667acb7e
Merge: a18195e 98df800
Author: Dima Zavin <dmitriyz@google.com>
Date:   Fri Sep 28 13:48:32 2012 -0700

    am 98df8002: am 08ab4d0c: Merge "exynos_omx: Do not call memset on object to be freed" into jb-mr1-dev

    * commit '98df80023577eeb52db103de4629abab42c4c462':
      exynos_omx: Do not call memset on object to be freed

commit 98df80023577eeb52db103de4629abab42c4c462
Merge: ae4a336 08ab4d0
Author: Dima Zavin <dmitriyz@google.com>
Date:   Fri Sep 28 13:47:26 2012 -0700

    am 08ab4d0c: Merge "exynos_omx: Do not call memset on object to be freed" into jb-mr1-dev

    * commit '08ab4d0c6e7aa319b5064ba859a937a1ec654902':
      exynos_omx: Do not call memset on object to be freed

commit a18195e2755ad7949fc13bddbc1db14a4bf3b5ac
Merge: 4c0eae6 ae4a336
Author: Greg Hackmann <ghackmann@google.com>
Date:   Fri Sep 28 11:00:57 2012 -0700

    am ae4a3362: am 6b236ec0: Merge "hwc: reduce blank ioctl EBUSY from error to info" into jb-mr1-dev

    * commit 'ae4a3362aa69bead64c68495bcc4008244a026f7':
      hwc: reduce blank ioctl EBUSY from error to info

commit ae4a3362aa69bead64c68495bcc4008244a026f7
Merge: 3e58140 6b236ec
Author: Greg Hackmann <ghackmann@google.com>
Date:   Fri Sep 28 10:59:11 2012 -0700

    am 6b236ec0: Merge "hwc: reduce blank ioctl EBUSY from error to info" into jb-mr1-dev

    * commit '6b236ec0c0aa68afa4692146a4b0e80f21d9767e':
      hwc: reduce blank ioctl EBUSY from error to info

commit 4c0eae6facd55c141fa5bbfe19fc8a2ca6dbaa1f
Merge: ae35017 3e58140
Author: Dima Zavin <dima@android.com>
Date:   Fri Sep 28 10:39:17 2012 -0700

    am 3e581401: am 405cc122: mobicore: remove useless kernel header

    * commit '3e5814015abcf3b8010c5847f1b674ec3b642e4c':
      mobicore: remove useless kernel header

commit ae35017f506c8b171ffc25bd504e81427361c5b4
Merge: 17b482c a2a6070
Author: Jungtae Kim <jt1217.kim@samsung.com>
Date:   Fri Sep 28 10:39:16 2012 -0700

    am a2a6070e: am 7b143edf: exynos: mobicore: update Mobicore userspace daemon and libraries

    * commit 'a2a6070ec1b55122c94a7721432fd313addc0ec3':
      exynos: mobicore: update Mobicore userspace daemon and libraries

commit 3e5814015abcf3b8010c5847f1b674ec3b642e4c
Merge: a2a6070 405cc12
Author: Dima Zavin <dima@android.com>
Date:   Fri Sep 28 10:36:29 2012 -0700

    am 405cc122: mobicore: remove useless kernel header

    * commit '405cc12255d59427f17ebc017daf9af589e2640e':
      mobicore: remove useless kernel header

commit a2a6070ec1b55122c94a7721432fd313addc0ec3
Merge: 198134e 7b143ed
Author: Jungtae Kim <jt1217.kim@samsung.com>
Date:   Fri Sep 28 10:36:29 2012 -0700

    am 7b143edf: exynos: mobicore: update Mobicore userspace daemon and libraries

    * commit '7b143edf281bed18c8ebd0733465f3af5af327eb':
      exynos: mobicore: update Mobicore userspace daemon and libraries

commit 17b482c4ae5d62c63008eb6f6e7bc487eb7ad3d0
Merge: b0be426 198134e
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Fri Sep 28 00:37:07 2012 -0700

    am 198134eb: am 39433170: Revert "Double the memory in any blob allocations"

    * commit '198134eb385c6aaa7be7ce6923bba6e44abe0cca':
      Revert "Double the memory in any blob allocations"

commit b0be426a19199b50f0f9d8196f500f5a4403d3df
Merge: 77d15d1 4464023
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Sep 28 00:35:37 2012 -0700

    am 4464023d: am 3c006f81: hardware: samsung_slsi: libcamera2: Temp increase of jpeg max size

    * commit '4464023d6dda62f7fc18b46b8d83a8ceaa9c69b2':
      hardware: samsung_slsi: libcamera2: Temp increase of jpeg max size

commit 77d15d16c5476a886a848893d0c2cb8653329067
Merge: 09408c8 2646d05
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Sep 28 00:35:34 2012 -0700

    am 2646d051: am f0708d21: hardware: samsung_slsi: libcamera2: Modify stream release condition

    * commit '2646d051d3f4a3b3027f4d70901c2710b4c33f2c':
      hardware: samsung_slsi: libcamera2: Modify stream release condition

commit 09408c8b04e8a58f53ac379fd8f7ddfa69b20a0f
Merge: 5df4d25 8adf318
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Sep 28 00:35:33 2012 -0700

    am 8adf3185: am bf96172c: hardware: samsung_slsi: libcamera2: ion_map buffers for required case only

    * commit '8adf3185ccdee1dda7e4f7b0af666024978e0b3d':
      hardware: samsung_slsi: libcamera2: ion_map buffers for required case only

commit 5df4d25d3f3fb2d32d3c2426240db132e1268226
Merge: a788092 abef803
Author: Rebecca Zavin <rebecca@android.com>
Date:   Fri Sep 28 00:34:39 2012 -0700

    am abef8033: am 1952fb31: Merge "hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP" into jb-mr1-dev

    * commit 'abef8033fe8783d1f2021af17c46abf9be6e46ee':
      hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP

commit a78809265025d3a8cea9b79894f4894c7de196df
Merge: 9e28bce 1d41d72
Author: Greg Hackmann <ghackmann@google.com>
Date:   Fri Sep 28 00:34:26 2012 -0700

    am 1d41d721: am 2a19eb16: hwc: enforce X-coordinate alignment constraints

    * commit '1d41d7215c02fe92f42fd9bd3c817dec7daa73ef':
      hwc: enforce X-coordinate alignment constraints

commit 9e28bce80d0aaa8a87a12d62fc169dca08de3937
Merge: 871f4cd f06d6d7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Sep 28 00:32:29 2012 -0700

    am f06d6d73: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'f06d6d7361465ba2174bea88b3562afac9b94eb9':
      hardware: samsung_slsi: libcamera2: Fix capture aspect ratio bug
      hardware: samsung_slsi: libcamera2: Change ISP streamoff sequence
      hardware: samsung_slsi: libcamera2: update meta data region
      hardware: samsung_slsi: libcamera2: Fix frame completion scheme
      hardware: samsung_slsi: libcamera2: Preserve SCC info on res change.
      hardware: samsung_slsi: libcamera2: change min fd score value for meta data
      hardware: samsung_slsi: libcamera2: support face priority scene mode
      hardware: samsung_slsi: libcamera2: support flash off mode with ZSL
      hwc: enable gscaler on RGBX surfaces

commit 198134eb385c6aaa7be7ce6923bba6e44abe0cca
Merge: 4464023 3943317
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Sep 27 20:51:27 2012 -0700

    am 39433170: Revert "Double the memory in any blob allocations"

    * commit '39433170a04f1f9c307d29e3bb2d7d5e11bf7824':
      Revert "Double the memory in any blob allocations"

commit 4464023d6dda62f7fc18b46b8d83a8ceaa9c69b2
Merge: 2646d05 3c006f8
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Thu Sep 27 16:45:15 2012 -0700

    am 3c006f81: hardware: samsung_slsi: libcamera2: Temp increase of jpeg max size

    * commit '3c006f81491a876ab9ea48a6479592ea85c5059e':
      hardware: samsung_slsi: libcamera2: Temp increase of jpeg max size

commit 2646d051d3f4a3b3027f4d70901c2710b4c33f2c
Merge: 8adf318 f0708d2
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Thu Sep 27 16:34:42 2012 -0700

    am f0708d21: hardware: samsung_slsi: libcamera2: Modify stream release condition

    * commit 'f0708d21f0cbadbc03f3f940c5e9a03d8dc29bb8':
      hardware: samsung_slsi: libcamera2: Modify stream release condition

commit 8adf3185ccdee1dda7e4f7b0af666024978e0b3d
Merge: abef803 bf96172
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Thu Sep 27 16:34:42 2012 -0700

    am bf96172c: hardware: samsung_slsi: libcamera2: ion_map buffers for required case only

    * commit 'bf96172c9e9a71d1c48e619869579002cbbc2268':
      hardware: samsung_slsi: libcamera2: ion_map buffers for required case only

commit abef8033fe8783d1f2021af17c46abf9be6e46ee
Merge: 1d41d72 1952fb3
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 27 15:41:47 2012 -0700

    am 1952fb31: Merge "hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP" into jb-mr1-dev

    * commit '1952fb312e3202e475e81700b452273a74e819d4':
      hardware: samsung_slsi: libcamera2: Enqueue every frame to ISP

commit 1d41d7215c02fe92f42fd9bd3c817dec7daa73ef
Merge: f06d6d7 2a19eb1
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Sep 27 15:19:26 2012 -0700

    am 2a19eb16: hwc: enforce X-coordinate alignment constraints

    * commit '2a19eb169927b5669b2bc0adb96145b84ae49c6b':
      hwc: enforce X-coordinate alignment constraints

commit f06d6d7361465ba2174bea88b3562afac9b94eb9
Merge: e65f77a dcf2c47
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Sep 27 09:58:25 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I033900565b24e63e166a836229ffd021e3b4e682

commit 871f4cd833afda7ddfa0b9cc123298fde720401c
Merge: f8863b6 e65f77a
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 26 17:33:54 2012 -0700

    am e65f77a2: am 46bbff71: Merge "clean kernel headers" into jb-mr1-dev

    * commit 'e65f77a2ce4033b57cfefc3fee61bd07dc06e458':
      clean kernel headers

commit e65f77a2ce4033b57cfefc3fee61bd07dc06e458
Merge: a5a10b2 46bbff7
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 26 17:32:27 2012 -0700

    am 46bbff71: Merge "clean kernel headers" into jb-mr1-dev

    * commit '46bbff719a64d7fef89e702b0d86164bcae0ee37':
      clean kernel headers

commit f8863b61c2f7294da62f4ae44ce6dd3c0ee6c24d
Merge: 2da0334 a5a10b2
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 26 16:49:07 2012 -0700

    am a5a10b2f: am 9eb2a020: hwc: support HAL_PIXEL_FORMAT_BGRA_8888

    * commit 'a5a10b2f14089afbd98d30114f16a8fb2b93138a':
      hwc: support HAL_PIXEL_FORMAT_BGRA_8888

commit a5a10b2f14089afbd98d30114f16a8fb2b93138a
Merge: 38246f8 9eb2a02
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 26 16:48:00 2012 -0700

    am 9eb2a020: hwc: support HAL_PIXEL_FORMAT_BGRA_8888

    * commit '9eb2a0209e821f702227c61ccf7dd18aca2a6d82':
      hwc: support HAL_PIXEL_FORMAT_BGRA_8888

commit 2da033433339d012c39ac3f34f73b44f87e9d469
Merge: 75123b0 38246f8
Author: Benoit Goby <benoit@android.com>
Date:   Wed Sep 26 15:20:36 2012 -0700

    am 38246f8d: am 105be0b2: hwc: Return a release fence for the FRAMEBUFFER_TARGET layer

    * commit '38246f8dabe68e37a0a24c9941a9bbf16c18814e':
      hwc: Return a release fence for the FRAMEBUFFER_TARGET layer

commit 75123b04d796473b8df856b91416e084c8280aa2
Merge: 45ff868 21c0394
Author: Benoit Goby <benoit@android.com>
Date:   Wed Sep 26 15:19:04 2012 -0700

    am 21c03946: am 133c71aa: Merge "libgscaler: Add support for sync" into jb-mr1-dev

    * commit '21c0394617eb39abe014c694942eaf277fb23466':
      libgscaler: Add support for sync

commit 38246f8dabe68e37a0a24c9941a9bbf16c18814e
Merge: 21c0394 105be0b
Author: Benoit Goby <benoit@android.com>
Date:   Wed Sep 26 15:18:43 2012 -0700

    am 105be0b2: hwc: Return a release fence for the FRAMEBUFFER_TARGET layer

    * commit '105be0b2aac13c94567036612a9556aae34c1590':
      hwc: Return a release fence for the FRAMEBUFFER_TARGET layer

commit 21c0394617eb39abe014c694942eaf277fb23466
Merge: 269a05a 133c71a
Author: Benoit Goby <benoit@android.com>
Date:   Wed Sep 26 15:17:21 2012 -0700

    am 133c71aa: Merge "libgscaler: Add support for sync" into jb-mr1-dev

    * commit '133c71aaddcc50a2fbe06868e9f9002c4d155380':
      libgscaler: Add support for sync

commit 45ff86804d032016dd0512ac4a82ad3e57b20e96
Merge: b3fbd09 269a05a
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Sep 26 13:34:32 2012 -0700

    am 269a05a0: am 8a3fc5dd: hardware: samsung_slsi: libcamera2: bug fix of single AF

    * commit '269a05a07d88609489c88f342e3f0ecb66e82535':
      hardware: samsung_slsi: libcamera2: bug fix of single AF

commit b3fbd094753126e1657f1bb04575eadaed1efe63
Merge: 97961eb 085061a
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Sep 26 13:34:31 2012 -0700

    am 085061a4: am 1e73adbc: hardware: samsung_slsi: libcamera2: modify CAF sequence for flash

    * commit '085061a483b1e2db3f3012aef9e51ed6b2d8c44a':
      hardware: samsung_slsi: libcamera2: modify CAF sequence for flash

commit 269a05a07d88609489c88f342e3f0ecb66e82535
Merge: 085061a 8a3fc5d
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Sep 26 13:32:51 2012 -0700

    am 8a3fc5dd: hardware: samsung_slsi: libcamera2: bug fix of single AF

    * commit '8a3fc5dddd1aecdc2acd4af9705119a4df12d6b7':
      hardware: samsung_slsi: libcamera2: bug fix of single AF

commit 085061a483b1e2db3f3012aef9e51ed6b2d8c44a
Merge: c4726ba 1e73adb
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Sep 26 13:32:51 2012 -0700

    am 1e73adbc: hardware: samsung_slsi: libcamera2: modify CAF sequence for flash

    * commit '1e73adbcd84cd67ac22894cacae2a13f8e3e6570':
      hardware: samsung_slsi: libcamera2: modify CAF sequence for flash

commit 97961eb06aa715851710804950f09117d676d398
Merge: 9368f58 c4726ba
Author: Benoit Goby <benoit@android.com>
Date:   Wed Sep 26 12:47:57 2012 -0700

    am c4726bad: am 4f439969: hwc: Remove force_fb flag, there\'s always content for HDMI

    * commit 'c4726bad7dd6d260a5258f9327e24c4e43d5332e':
      hwc: Remove force_fb flag, there's always content for HDMI

commit 9368f58da98de5d177b687be00b9331bc1df3e21
Merge: e3d9612 703debd
Author: Benoit Goby <benoit@android.com>
Date:   Wed Sep 26 12:46:34 2012 -0700

    am 703debda: am 48a69545: hwc: Ignore content for HDMI when it is not enabled

    * commit '703debda6cc471885611e7211da8a4c08fc05a0f':
      hwc: Ignore content for HDMI when it is not enabled

commit c4726bad7dd6d260a5258f9327e24c4e43d5332e
Merge: 703debd 4f43996
Author: Benoit Goby <benoit@android.com>
Date:   Wed Sep 26 12:45:47 2012 -0700

    am 4f439969: hwc: Remove force_fb flag, there\'s always content for HDMI

    * commit '4f4399698e74d09820621027cf0f0e001f1c064a':
      hwc: Remove force_fb flag, there's always content for HDMI

commit 703debda6cc471885611e7211da8a4c08fc05a0f
Merge: 9951233 48a6954
Author: Benoit Goby <benoit@android.com>
Date:   Wed Sep 26 12:44:20 2012 -0700

    am 48a69545: hwc: Ignore content for HDMI when it is not enabled

    * commit '48a6954594cd33170a493b85a95246741cbd3ce6':
      hwc: Ignore content for HDMI when it is not enabled

commit e3d9612feeff7fd8a8b9cd6d6619057632562359
Merge: bde52ea 9951233
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Sep 26 11:46:29 2012 -0700

    am 99512330: am 87424342: Merge changes I970f5995,I2cf7120a,I2118dee2,Ib6082faa,Iad063164,If454186d,If189904f,I261e454e into jb-mr1-dev

    * commit '995123306ca66fed4af59cb7d466c9cbaf931dd6':
      hardware: samsung_slsi: libcamera2: Fix capture aspect ratio bug
      hardware: samsung_slsi: libcamera2: Change ISP streamoff sequence
      hardware: samsung_slsi: libcamera2: update meta data region
      hardware: samsung_slsi: libcamera2: Fix frame completion scheme
      hardware: samsung_slsi: libcamera2: Preserve SCC info on res change.
      hardware: samsung_slsi: libcamera2: change min fd score value for meta data
      hardware: samsung_slsi: libcamera2: support face priority scene mode
      hardware: samsung_slsi: libcamera2: support flash off mode with ZSL

commit 995123306ca66fed4af59cb7d466c9cbaf931dd6
Merge: 3cb2382 8742434
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Sep 26 11:44:52 2012 -0700

    am 87424342: Merge changes I970f5995,I2cf7120a,I2118dee2,Ib6082faa,Iad063164,If454186d,If189904f,I261e454e into jb-mr1-dev

    * commit '87424342bc6e8494eccdd8a179a85045d7198692':
      hardware: samsung_slsi: libcamera2: Fix capture aspect ratio bug
      hardware: samsung_slsi: libcamera2: Change ISP streamoff sequence
      hardware: samsung_slsi: libcamera2: update meta data region
      hardware: samsung_slsi: libcamera2: Fix frame completion scheme
      hardware: samsung_slsi: libcamera2: Preserve SCC info on res change.
      hardware: samsung_slsi: libcamera2: change min fd score value for meta data
      hardware: samsung_slsi: libcamera2: support face priority scene mode
      hardware: samsung_slsi: libcamera2: support flash off mode with ZSL

commit bde52ea09dbb91fdd9c4c41767eb5c0c9bdaf6f3
Merge: 91b090d 3cb2382
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 26 10:34:28 2012 -0700

    am 3cb23825: am b5c759a1: Merge "hwc: enable gscaler on RGBX surfaces" into jb-mr1-dev

    * commit '3cb238254f55f09188bc2aa5ccdcebfde11d47fc':
      hwc: enable gscaler on RGBX surfaces

commit 3cb238254f55f09188bc2aa5ccdcebfde11d47fc
Merge: 9074223 b5c759a
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 26 10:32:34 2012 -0700

    am b5c759a1: Merge "hwc: enable gscaler on RGBX surfaces" into jb-mr1-dev

    * commit 'b5c759a13d830316d9e05dc5eeeb1010babc27b3':
      hwc: enable gscaler on RGBX surfaces

commit 91b090df51958d621a95685d12e7b210cc25908a
Merge: 62ed4e4 9074223
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Sep 26 10:08:28 2012 -0700

    am 90742234: am fb0c3b3f: Revert "hardware: samsung_slsi: libcamera2: update meta data region"

    * commit '90742234ed7e579b24002166d64250e7a8145841':
      Revert "hardware: samsung_slsi: libcamera2: update meta data region"

commit 62ed4e486de5e0c49575ca480ebe572fa89ff673
Merge: 11192ab 6867636
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Sep 26 10:08:25 2012 -0700

    am 68676365: am bb2401f4: hardware: samsung_slsi: libcamera2: update meta data region

    * commit '68676365bfd1f7062bd575c59eef5b3771f56bdc':
      hardware: samsung_slsi: libcamera2: update meta data region

commit 11192ab9ebfe1b6aee10b015ca62745f95705ed3
Merge: 3c23366 8bfe25a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 26 10:07:38 2012 -0700

    am 8bfe25ad: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '8bfe25adc944c5dfad3beb94501903a0427fcac7':

commit 90742234ed7e579b24002166d64250e7a8145841
Merge: 6867636 fb0c3b3
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Sep 26 09:58:02 2012 -0700

    am fb0c3b3f: Revert "hardware: samsung_slsi: libcamera2: update meta data region"

    * commit 'fb0c3b3f4375442cc24ca4c58a449b6f23bf5093':
      Revert "hardware: samsung_slsi: libcamera2: update meta data region"

commit 68676365bfd1f7062bd575c59eef5b3771f56bdc
Merge: 8bfe25a bb2401f
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Sep 26 09:56:39 2012 -0700

    am bb2401f4: hardware: samsung_slsi: libcamera2: update meta data region

    * commit 'bb2401f4cd673f302ecd44197dbc85b2563ddb32':
      hardware: samsung_slsi: libcamera2: update meta data region

commit 8bfe25adc944c5dfad3beb94501903a0427fcac7
Merge: 8f2e7bd d91918a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Sep 26 09:07:22 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I904ad0b06308d3af92aea13ef6ca40911b061508

commit 3c233665d09d4a290e0342b74f0649798785206b
Merge: 8e9bc46 8f2e7bd
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Sep 26 08:26:46 2012 -0700

    am 8f2e7bd3: am 53efd24f: Double the memory in any blob allocations

    * commit '8f2e7bd378c0eda9bf6552ea1d30e64470162f59':
      Double the memory in any blob allocations

commit 8f2e7bd378c0eda9bf6552ea1d30e64470162f59
Merge: 6a8f47a 53efd24
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Sep 26 00:31:26 2012 -0700

    am 53efd24f: Double the memory in any blob allocations

    * commit '53efd24f292043771988c4715225a2bca32ad2a8':
      Double the memory in any blob allocations

commit 8e9bc46a2b81794716346465643f1721f58992f8
Merge: ee085d6 6a8f47a
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Sep 25 22:11:10 2012 -0700

    am 6a8f47a8: am d15fb8b7: Fix bug in allocation of HAL_PIXEL_FORMAT_BLOB

    * commit '6a8f47a834e6446861a24f025d91d8d2ba405382':
      Fix bug in allocation of HAL_PIXEL_FORMAT_BLOB

commit 6a8f47a834e6446861a24f025d91d8d2ba405382
Merge: 1031691 d15fb8b
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Sep 25 22:08:54 2012 -0700

    am d15fb8b7: Fix bug in allocation of HAL_PIXEL_FORMAT_BLOB

    * commit 'd15fb8b7ac73bcc7b24999f1aadd52835ed4d95d':
      Fix bug in allocation of HAL_PIXEL_FORMAT_BLOB

commit ee085d62e99a655d42a2673ccc3c7b0e7ef9c083
Merge: b2a6dc2 1031691
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 24 23:47:40 2012 -0700

    am 10316919: am a85ec381: hardware: samsung_slsi: libcamera2: Add safety code for frame drop

    * commit '10316919762b5b8282369283301db97db5a4a4e8':
      hardware: samsung_slsi: libcamera2: Add safety code for frame drop

commit b2a6dc2e0e1a6a0f2eb952bb70dea91deb54d02b
Merge: 418f350 9aa21e0
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 24 23:47:39 2012 -0700

    am 9aa21e03: am 1c5e692d: hardware: samsung_slsi: libcamera2: Increase request queue size

    * commit '9aa21e034e2b61039d95a5bcfa081af7283c1f38':
      hardware: samsung_slsi: libcamera2: Increase request queue size

commit 418f350e0f35960f480aca0100ef9ab361efc043
Merge: ee64c3b 5cb8cf0
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 24 23:47:39 2012 -0700

    am 5cb8cf0d: am 4017b08c: hardware: samsung_slsi: libcamera2: Support for disabling thumbnail

    * commit '5cb8cf0d11319d1cf42a26785d4b233e05cc074d':
      hardware: samsung_slsi: libcamera2: Support for disabling thumbnail

commit ee64c3ba0a96fbca22b68027cf25a54e858033a8
Merge: 7f123aa 6c0169d
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 24 23:46:11 2012 -0700

    am 6c0169d9: am 90e439c1: hardware: samsung_slsi: libcamera2: Support reverse order of ZSL setup

    * commit '6c0169d97c6ea34352db4f97edaa4227f7ed2647':
      hardware: samsung_slsi: libcamera2: Support reverse order of ZSL setup

commit 7f123aabbba37a2f1c43fc0eeee33be2f2c839c6
Merge: 892ab10 25547fa
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Sep 24 23:46:10 2012 -0700

    am 25547fa6: am f7f8d321: hardware: samsung_slsi: libcamera2: modify CAF sequence for flash

    * commit '25547fa60c153a9f7e3c729fb85fa98ee2425656':
      hardware: samsung_slsi: libcamera2: modify CAF sequence for flash

commit 10316919762b5b8282369283301db97db5a4a4e8
Merge: 9aa21e0 a85ec38
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 24 23:46:01 2012 -0700

    am a85ec381: hardware: samsung_slsi: libcamera2: Add safety code for frame drop

    * commit 'a85ec381852b79025154d21a78f9bbf28b474462':
      hardware: samsung_slsi: libcamera2: Add safety code for frame drop

commit 9aa21e034e2b61039d95a5bcfa081af7283c1f38
Merge: 5cb8cf0 1c5e692
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 24 23:45:57 2012 -0700

    am 1c5e692d: hardware: samsung_slsi: libcamera2: Increase request queue size

    * commit '1c5e692d86d92906c7bde609fddb4af0742ce896':
      hardware: samsung_slsi: libcamera2: Increase request queue size

commit 5cb8cf0d11319d1cf42a26785d4b233e05cc074d
Merge: 6c0169d 4017b08
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 24 23:45:55 2012 -0700

    am 4017b08c: hardware: samsung_slsi: libcamera2: Support for disabling thumbnail

    * commit '4017b08c048a827a1299fb60859a72bfcda473f4':
      hardware: samsung_slsi: libcamera2: Support for disabling thumbnail

commit 6c0169d97c6ea34352db4f97edaa4227f7ed2647
Merge: 25547fa 90e439c
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 24 23:44:28 2012 -0700

    am 90e439c1: hardware: samsung_slsi: libcamera2: Support reverse order of ZSL setup

    * commit '90e439c14994b2f82da00c131a5e76646a2e127b':
      hardware: samsung_slsi: libcamera2: Support reverse order of ZSL setup

commit 25547fa60c153a9f7e3c729fb85fa98ee2425656
Merge: 6f90bba f7f8d32
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Sep 24 23:44:27 2012 -0700

    am f7f8d321: hardware: samsung_slsi: libcamera2: modify CAF sequence for flash

    * commit 'f7f8d32121e67c60900dbe5239b5b4ce937d4692':
      hardware: samsung_slsi: libcamera2: modify CAF sequence for flash

commit 892ab10617648d239da90e6763e0b0855ad95d5b
Merge: 6e74d5f 6f90bba
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 24 10:14:57 2012 -0700

    am 6f90bbaa: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '6f90bbaa2419d0ed62099113fd44d0ea179053d2':
      libcamera2: Enable video stabilization
      exynos5: libhwc: support the directFB for RGB565.
      Revert "hwc: enforce bandwidth limitations on each memory interface"
      Revert "hwc: enable gscaler on RGBX8888 surfaces"
      hardware: samsung_slsi: libcamera2: Fix preview delay and recording bugs
      hardware: samsung_slsi: libcamera2: update flash function

commit 6f90bbaa2419d0ed62099113fd44d0ea179053d2
Merge: b953ee5 79a06e5
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Sep 24 10:12:41 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib0e59d17038dfd036893ef11e3f4ba2005f525a8

commit 6e74d5f35584f1f58917ca2fddbf48db0f2f513f
Merge: 51f1304 b953ee5
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Mon Sep 24 08:49:07 2012 -0700

    am b953ee56: am 5b46229d: exynos_omx: multi_thread: Remove hardcoded limit on the max of number of input buffers allowed in video encoders

    * commit 'b953ee560f6b307b516f9a24a0ec59d16c41ff2f':
      exynos_omx: multi_thread: Remove hardcoded limit on the max of number of input buffers allowed in video encoders

commit b953ee560f6b307b516f9a24a0ec59d16c41ff2f
Merge: 42f814d 5b46229
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Mon Sep 24 08:27:33 2012 -0700

    am 5b46229d: exynos_omx: multi_thread: Remove hardcoded limit on the max of number of input buffers allowed in video encoders

    * commit '5b46229d5940c68462ba3c42f65ae00550ab7c0b':
      exynos_omx: multi_thread: Remove hardcoded limit on the max of number of input buffers allowed in video encoders

commit 51f1304d3bba1c013dc0e77db937912f1ff2bb8d
Merge: 3c3542b 42f814d
Author: Benoit Goby <benoit@android.com>
Date:   Mon Sep 24 00:51:58 2012 -0700

    am 42f814d4: am f38570d8: Merge "hwc: Call hotplug on HPD" into jb-mr1-dev

    * commit '42f814d4ca5e57bc6d7cb64e6b900b131bda8654':
      hwc: Call hotplug on HPD

commit 42f814d4ca5e57bc6d7cb64e6b900b131bda8654
Merge: deb7591 f38570d
Author: Benoit Goby <benoit@android.com>
Date:   Fri Sep 21 16:59:15 2012 -0700

    am f38570d8: Merge "hwc: Call hotplug on HPD" into jb-mr1-dev

    * commit 'f38570d83cd77c9ad5ab2cfe6225d78cc89dcdf6':
      hwc: Call hotplug on HPD

commit 3c3542bcb35f61028e6ca3045807fa025b5d0dc3
Merge: eb5708e deb7591
Author: Alex Ray <aray@google.com>
Date:   Fri Sep 21 12:45:14 2012 -0700

    am deb75917: am a86f87c7: libcamera2: Enable video stabilization

    * commit 'deb759171d8adc5f88fc358d6980653c49ee5663':
      libcamera2: Enable video stabilization

commit deb759171d8adc5f88fc358d6980653c49ee5663
Merge: 31798a3 a86f87c
Author: Alex Ray <aray@google.com>
Date:   Fri Sep 21 10:31:58 2012 -0700

    am a86f87c7: libcamera2: Enable video stabilization

    * commit 'a86f87c74965e066748af3632000737fb115b56f':
      libcamera2: Enable video stabilization

commit eb5708e4ee73cd3a6fcaddfbac07dc4b77ac49f2
Merge: a6f5c5c 31798a3
Author: Benoit Goby <benoit@android.com>
Date:   Thu Sep 20 20:31:01 2012 -0700

    am 31798a32: am 922abbf4: hwc: Implement prepare and set for HDMI

    * commit '31798a323b8ec819fde001bbe829d3a063bf95ff':
      hwc: Implement prepare and set for HDMI

commit a6f5c5c1b62429021cc0631990e0b3ff9647fc84
Merge: eb9f9b0 d1151ba
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 20:31:01 2012 -0700

    am d1151baa: am b5efffe0: Merge "hardware: samsung_slsi: libcamera2: add classification of FD meta data" into jb-mr1-dev

    * commit 'd1151baaa92dda70fde20514c69107f02416aebb':
      hardware: samsung_slsi: libcamera2: add classification of FD meta data

commit eb9f9b084c5a0ce63d51984f068a48aeb2465121
Merge: 13b94b2 7abd8e4
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 20:31:00 2012 -0700

    am 7abd8e47: am ebfee24b: Merge "hardware: samsung_slsi: libcamera2: Touch AF and WB exif bug fix" into jb-mr1-dev

    * commit '7abd8e47335af5b0733c3ce3191880e8d27b8003':
      hardware: samsung_slsi: libcamera2: Touch AF and WB exif bug fix

commit 13b94b26875b9145effd471d162009b2ec5047c1
Merge: 10a0732 56e2590
Author: Sanghee Kim <haya93@samsung.com>
Date:   Thu Sep 20 20:30:59 2012 -0700

    am 56e25907: am 05cbd792: exynos5: libhwc: support the directFB for RGB565.

    * commit '56e25907166d47ee104181408bf0a94e95dccdb4':
      exynos5: libhwc: support the directFB for RGB565.

commit 31798a323b8ec819fde001bbe829d3a063bf95ff
Merge: d1151ba 922abbf
Author: Benoit Goby <benoit@android.com>
Date:   Thu Sep 20 20:22:41 2012 -0700

    am 922abbf4: hwc: Implement prepare and set for HDMI

    * commit '922abbf42012f01c15f28eb4f994218b253f4ccd':
      hwc: Implement prepare and set for HDMI

commit d1151baaa92dda70fde20514c69107f02416aebb
Merge: 7abd8e4 b5efffe
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 20:22:40 2012 -0700

    am b5efffe0: Merge "hardware: samsung_slsi: libcamera2: add classification of FD meta data" into jb-mr1-dev

    * commit 'b5efffe05f391d060aa99428ed529a55f37bce27':
      hardware: samsung_slsi: libcamera2: add classification of FD meta data

commit 7abd8e47335af5b0733c3ce3191880e8d27b8003
Merge: 56e2590 ebfee24
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 20:22:40 2012 -0700

    am ebfee24b: Merge "hardware: samsung_slsi: libcamera2: Touch AF and WB exif bug fix" into jb-mr1-dev

    * commit 'ebfee24bc276892c13733cb09f19eb72e63f034e':
      hardware: samsung_slsi: libcamera2: Touch AF and WB exif bug fix

commit 56e25907166d47ee104181408bf0a94e95dccdb4
Merge: af5d1f9 05cbd79
Author: Sanghee Kim <haya93@samsung.com>
Date:   Thu Sep 20 20:22:39 2012 -0700

    am 05cbd792: exynos5: libhwc: support the directFB for RGB565.

    * commit '05cbd792101e9f4b58ae6a0b78e444c100d6b770':
      exynos5: libhwc: support the directFB for RGB565.

commit 10a0732ef0ffba2a9ca6d39c51cb4d7073f32b08
Merge: 13b35a2 af5d1f9
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 15:46:21 2012 -0700

    am af5d1f92: am e689c028: Merge "hwc: send non-gscaler fence fds to kernel" into jb-mr1-dev

    * commit 'af5d1f92cbc31a39d747434682b6413d8ebcfd38':
      hwc: send non-gscaler fence fds to kernel

commit 13b35a2079b10296da94f6aaa9625bddbb8ee416
Merge: 2ec743a 11f4f8a
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Sep 20 15:46:21 2012 -0700

    am 11f4f8a9: am f8552390: Update gralloc to use new ion flag

    * commit '11f4f8a9e4281b19b0aafd744090a8db16a7f595':
      Update gralloc to use new ion flag

commit 2ec743aaf3a0e5931fa09cc52ddb7d6460563e2b
Merge: 8c5248f 310757b
Author: Jesse Hall <jessehall@google.com>
Date:   Thu Sep 20 15:46:13 2012 -0700

    am 310757bc: am 6d6fbb7e: Merge "getDisplayAttributes now returns an error code" into jb-mr1-dev

    * commit '310757bc85a307cfa64f4eeca2e74c74da72cc72':
      getDisplayAttributes now returns an error code

commit af5d1f92cbc31a39d747434682b6413d8ebcfd38
Merge: 11f4f8a e689c02
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 14:43:20 2012 -0700

    am e689c028: Merge "hwc: send non-gscaler fence fds to kernel" into jb-mr1-dev

    * commit 'e689c0288fd0cf934c7e57952d6092bdc58a0aca':
      hwc: send non-gscaler fence fds to kernel

commit 11f4f8a9e4281b19b0aafd744090a8db16a7f595
Merge: 310757b f855239
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Sep 20 14:43:19 2012 -0700

    am f8552390: Update gralloc to use new ion flag

    * commit 'f8552390550d9e8acfd3e87c9a306733842b7aa7':
      Update gralloc to use new ion flag

commit 310757bc85a307cfa64f4eeca2e74c74da72cc72
Merge: b1fd81e 6d6fbb7
Author: Jesse Hall <jessehall@google.com>
Date:   Thu Sep 20 14:15:20 2012 -0700

    am 6d6fbb7e: Merge "getDisplayAttributes now returns an error code" into jb-mr1-dev

    * commit '6d6fbb7ee5b273fd957df1c2e0fae9f08bc360a5':
      getDisplayAttributes now returns an error code

commit 8c5248fe2e92d20f42cb7a8968c5e6994048d609
Merge: 2baad7f b1fd81e
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 12:52:56 2012 -0700

    am b1fd81e1: am 73ae067c: Merge "hardware: samsung_slsi: libcamera2: Change timing of stream notification" into jb-mr1-dev

    * commit 'b1fd81e14ae05e3e45433c9ab438631a82327c8a':
      hardware: samsung_slsi: libcamera2: Change timing of stream notification

commit 2baad7fdf257b0f60a1f543d91046a899e8bada8
Merge: e55f61b d1be174
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 12:52:54 2012 -0700

    am d1be1745: am 2028f6dc: Merge "hardware: samsung_slsi: libcamera2: ZSL Bug fixes" into jb-mr1-dev

    * commit 'd1be1745b58c4ac83a4f18db24c1f7e57544e6db':
      hardware: samsung_slsi: libcamera2: ZSL Bug fixes

commit e55f61b1817a868d32ac32de29a614380a7efa18
Merge: b6bd359 cbc8edd
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 12:52:53 2012 -0700

    am cbc8eddd: am 0abca18c: Merge "hardware: samsung_slsi: libcamera2: Supports VDIS static metadata" into jb-mr1-dev

    * commit 'cbc8eddd80889687630b311a9074c082e489f4f3':
      hardware: samsung_slsi: libcamera2: Supports VDIS static metadata

commit b1fd81e14ae05e3e45433c9ab438631a82327c8a
Merge: d1be174 73ae067
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 12:49:09 2012 -0700

    am 73ae067c: Merge "hardware: samsung_slsi: libcamera2: Change timing of stream notification" into jb-mr1-dev

    * commit '73ae067c25e7182a04f88693b1e5e9d98a5b523a':
      hardware: samsung_slsi: libcamera2: Change timing of stream notification

commit d1be1745b58c4ac83a4f18db24c1f7e57544e6db
Merge: cbc8edd 2028f6d
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 12:49:08 2012 -0700

    am 2028f6dc: Merge "hardware: samsung_slsi: libcamera2: ZSL Bug fixes" into jb-mr1-dev

    * commit '2028f6dc8797e96770a866c4110f24c8ba8cb7c3':
      hardware: samsung_slsi: libcamera2: ZSL Bug fixes

commit cbc8eddd80889687630b311a9074c082e489f4f3
Merge: 12e98fa 0abca18
Author: Rebecca Zavin <rebecca@android.com>
Date:   Thu Sep 20 12:49:07 2012 -0700

    am 0abca18c: Merge "hardware: samsung_slsi: libcamera2: Supports VDIS static metadata" into jb-mr1-dev

    * commit '0abca18cc2cb62017c2fe62ad94af39e60fe31a1':
      hardware: samsung_slsi: libcamera2: Supports VDIS static metadata

commit b6bd3592941a76dcc34f31de6f31f791960b51b7
Merge: cfd5717 12e98fa
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Sep 20 09:29:00 2012 -0700

    am 12e98fad: am 81575141: hwc: fixup windows configurations that extend past screen edge

    * commit '12e98fade61b87b41186dd35588c9912b7330650':
      hwc: fixup windows configurations that extend past screen edge

commit 12e98fade61b87b41186dd35588c9912b7330650
Merge: 6352cca 8157514
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Sep 20 06:08:11 2012 -0700

    am 81575141: hwc: fixup windows configurations that extend past screen edge

    * commit '815751411da165d12de0b71190d0ded1bb84bff2':
      hwc: fixup windows configurations that extend past screen edge

commit cfd5717b859bfcbc8632fc51c20c94d535d145b3
Merge: 5ce2a98 6352cca
Author: Dima Zavin <dmitriyz@google.com>
Date:   Tue Sep 18 17:01:20 2012 -0700

    am 6352ccaf: am d524220c: Merge changes I83981ce2,I352ca1a1 into jb-mr1-dev

    * commit '6352ccaf8fb4ae2dd93bcfdbc417e1047888c2ab':
      hardware: samsung_slsi: exynos5: Seperate Secure memory region
      mobicore : Added external variable for DRM library

commit 5ce2a987c6cf1f54b4176f7af83f340063980e65
Merge: d548ea8 2948811
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 17:01:18 2012 -0700

    am 2948811a: am d01b834b: Merge "hwc: add system property to force gpu composition" into jb-mr1-dev

    * commit '2948811ae37506ccf744cb6cb29244bc9093448a':
      hwc: add system property to force gpu composition

commit 6352ccaf8fb4ae2dd93bcfdbc417e1047888c2ab
Merge: 2948811 d524220
Author: Dima Zavin <dmitriyz@google.com>
Date:   Tue Sep 18 16:54:47 2012 -0700

    am d524220c: Merge changes I83981ce2,I352ca1a1 into jb-mr1-dev

    * commit 'd524220ccc389e317012a894fd790ec275587187':
      hardware: samsung_slsi: exynos5: Seperate Secure memory region
      mobicore : Added external variable for DRM library

commit 2948811ae37506ccf744cb6cb29244bc9093448a
Merge: 85f42c6 d01b834
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 16:54:28 2012 -0700

    am d01b834b: Merge "hwc: add system property to force gpu composition" into jb-mr1-dev

    * commit 'd01b834b799e64ef7ce2281b700f88e666a02034':
      hwc: add system property to force gpu composition

commit d548ea8e8b511fe1c29631b0bcdc751f29de5cb6
Merge: 9fee2ba 85f42c6
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 15:33:44 2012 -0700

    am 85f42c66: am 4e56307c: Merge "hardware: samsung_slsi: libcamera2: Add a signal buffer to threads" into jb-mr1-dev

    * commit '85f42c666a326d4e2ff180460e83a4d8a262fa88':
      hardware: samsung_slsi: libcamera2: Add a signal buffer to threads

commit 9fee2ba28c9a69982a4fe5bf79b52e8a73392921
Merge: 77217dc ab6c83f
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 15:33:43 2012 -0700

    am ab6c83fb: am afc13d8e: Merge "hardware: samsung_slsi: libcamera2: Fix mode switch bug and log msgs" into jb-mr1-dev

    * commit 'ab6c83fbc9cc5466d421157ed560fc178aec7d01':
      hardware: samsung_slsi: libcamera2: Fix mode switch bug and log msgs

commit 77217dc36454f5ebe75181fafbb9ba55db68eda1
Merge: 731e42e 185d429
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 15:33:43 2012 -0700

    am 185d429e: am ecf071ed: Merge "hardware: samsung_slsi: libcamera2: Modify thread creators" into jb-mr1-dev

    * commit '185d429e36353a6f7f2bcc90176170d7f9a29fe0':
      hardware: samsung_slsi: libcamera2: Modify thread creators

commit 85f42c666a326d4e2ff180460e83a4d8a262fa88
Merge: ab6c83f 4e56307
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 15:25:15 2012 -0700

    am 4e56307c: Merge "hardware: samsung_slsi: libcamera2: Add a signal buffer to threads" into jb-mr1-dev

    * commit '4e56307c39079dfc1e9fd07958836d73724fa435':
      hardware: samsung_slsi: libcamera2: Add a signal buffer to threads

commit ab6c83fbc9cc5466d421157ed560fc178aec7d01
Merge: 185d429 afc13d8
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 15:25:14 2012 -0700

    am afc13d8e: Merge "hardware: samsung_slsi: libcamera2: Fix mode switch bug and log msgs" into jb-mr1-dev

    * commit 'afc13d8ea85626cd26ef51c3d01b5ee6703c0183':
      hardware: samsung_slsi: libcamera2: Fix mode switch bug and log msgs

commit 185d429e36353a6f7f2bcc90176170d7f9a29fe0
Merge: f86f21d ecf071e
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 15:25:13 2012 -0700

    am ecf071ed: Merge "hardware: samsung_slsi: libcamera2: Modify thread creators" into jb-mr1-dev

    * commit 'ecf071ed5713d962b931438d47f10e42e87890b5':
      hardware: samsung_slsi: libcamera2: Modify thread creators

commit 731e42e80cf0378412c8d9689092c5d1aa7f7a2d
Merge: a886d13 f86f21d
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 14:49:14 2012 -0700

    am f86f21d6: am b0b3bdd5: hwc: implement HWC HAL 1.1

    * commit 'f86f21d6d74ad5ee10de44c51e81e0175589668b':
      hwc: implement HWC HAL 1.1

commit a886d1370ef759de49a4f669b76ba5c975cb1baa
Merge: 7984537 49b4d00
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 14:49:13 2012 -0700

    am 49b4d005: am 0c1ba823: HACK: hwc: hard-code screen resolution

    * commit '49b4d0054adfd09ba8888aae591c722c6a59e5cf':
      HACK: hwc: hard-code screen resolution

commit 7984537e58b1a56d039586cb7072a5091c2a6600
Merge: 52017c3 21633af
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 14:49:13 2012 -0700

    am 21633afe: am d92fe210: hwc: read display configuration directly from fb device

    * commit '21633afe65405a158e9f65ab32b3958fdb40f389':
      hwc: read display configuration directly from fb device

commit f86f21d6d74ad5ee10de44c51e81e0175589668b
Merge: 49b4d00 b0b3bdd
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 14:46:06 2012 -0700

    am b0b3bdd5: hwc: implement HWC HAL 1.1

    * commit 'b0b3bdd5a1eee14d55f00054b60e3aa2163306a3':
      hwc: implement HWC HAL 1.1

commit 49b4d0054adfd09ba8888aae591c722c6a59e5cf
Merge: 21633af 0c1ba82
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 14:46:05 2012 -0700

    am 0c1ba823: HACK: hwc: hard-code screen resolution

    * commit '0c1ba823fa2d24b931d44b4f96184379499fbb01':
      HACK: hwc: hard-code screen resolution

commit 21633afe65405a158e9f65ab32b3958fdb40f389
Merge: 387063f d92fe21
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 14:46:03 2012 -0700

    am d92fe210: hwc: read display configuration directly from fb device

    * commit 'd92fe2100aff8770bd7654e959a5832355218396':
      hwc: read display configuration directly from fb device

commit 52017c3d59ba757a482c622114b865233e33560a
Merge: 101aacd 387063f
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 14:01:45 2012 -0700

    am 387063f3: am 2f76084f: Merge "hwc: increase gscaler ring buffer size to 3" into jb-mr1-dev

    * commit '387063f36ec7aeaa95f5863656b3b8b86b6bb1bb':
      hwc: increase gscaler ring buffer size to 3

commit 387063f36ec7aeaa95f5863656b3b8b86b6bb1bb
Merge: b36bf06 2f76084
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 18 13:58:07 2012 -0700

    am 2f76084f: Merge "hwc: increase gscaler ring buffer size to 3" into jb-mr1-dev

    * commit '2f76084f7979dd3e6c5acf7cac974b024df2f1a5':
      hwc: increase gscaler ring buffer size to 3

commit 101aacddd449fd3f66ce64a1289fd435d9986bed
Merge: ba21707 b36bf06
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Sep 18 12:27:33 2012 -0700

    am b36bf061: am 53b3e1cb: Merge "STOPSHIP libcamera2: remove device metadata" into jb-mr1-dev

    * commit 'b36bf061410d3a13c1d46fe60bf9be60d33b4cfd':
      STOPSHIP libcamera2: remove device metadata

commit ba217072d212a1dbbb9735cc9b983487be28b87c
Merge: 73fac8a 73e9741
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 12:27:33 2012 -0700

    am 73e97413: am 3b4e516f: Merge "hardware: samsung_slsi: libcamera2: Adjust exposure time in metadata" into jb-mr1-dev

    * commit '73e9741343f4b7f82083699751be7df072533453':
      hardware: samsung_slsi: libcamera2: Adjust exposure time in metadata

commit 73fac8a4e06712fcde2ee8eecbc1b079ecff9e84
Merge: e058236 99a7441
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 12:27:32 2012 -0700

    am 99a7441f: am df7e74ae: Merge "hardware : samsung_slsi: libcamera2: pre-capture metering bug fix" into jb-mr1-dev

    * commit '99a7441f13a5fcde430f754415fd620b9e29aa57':
      hardware : samsung_slsi: libcamera2: pre-capture metering bug fix

commit e05823640dae87117962153659af47540703b085
Merge: 904bd08 800b2a1
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 12:27:31 2012 -0700

    am 800b2a17: am c36d041b: Merge "hardware: samsung_slsi: libcamera2: manual focus mode bug fix" into jb-mr1-dev

    * commit '800b2a1738486bd754d91307036a04b5d8718b4d':
      hardware: samsung_slsi: libcamera2: manual focus mode bug fix

commit b36bf061410d3a13c1d46fe60bf9be60d33b4cfd
Merge: 73e9741 53b3e1c
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Sep 18 12:15:15 2012 -0700

    am 53b3e1cb: Merge "STOPSHIP libcamera2: remove device metadata" into jb-mr1-dev

    * commit '53b3e1cb1b7671f18bd9075faebf26a344474340':
      STOPSHIP libcamera2: remove device metadata

commit 73e9741343f4b7f82083699751be7df072533453
Merge: 99a7441 3b4e516
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 12:15:13 2012 -0700

    am 3b4e516f: Merge "hardware: samsung_slsi: libcamera2: Adjust exposure time in metadata" into jb-mr1-dev

    * commit '3b4e516f9bbc2fbc3f2d8a0182975473695b72d0':
      hardware: samsung_slsi: libcamera2: Adjust exposure time in metadata

commit 99a7441f13a5fcde430f754415fd620b9e29aa57
Merge: 800b2a1 df7e74a
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 12:15:12 2012 -0700

    am df7e74ae: Merge "hardware : samsung_slsi: libcamera2: pre-capture metering bug fix" into jb-mr1-dev

    * commit 'df7e74ae8750b50db383935c3ee31f7ba518c9c4':
      hardware : samsung_slsi: libcamera2: pre-capture metering bug fix

commit 800b2a1738486bd754d91307036a04b5d8718b4d
Merge: 9f78a56 c36d041
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 18 12:15:09 2012 -0700

    am c36d041b: Merge "hardware: samsung_slsi: libcamera2: manual focus mode bug fix" into jb-mr1-dev

    * commit 'c36d041b7450187bc6c3c3eb125fba2ac89c546e':
      hardware: samsung_slsi: libcamera2: manual focus mode bug fix

commit 904bd08889095a04c5e04451d6eea900822cecb6
Merge: 1efa6c0 9f78a56
Author: Dima Zavin <dmitriyz@google.com>
Date:   Tue Sep 18 10:39:43 2012 -0700

    am 9f78a562: am 4d1c1eea: Merge "exynos5: libkeymaster: add keymaster HAL for Exynos5" into jb-mr1-dev

    * commit '9f78a562a4665bdd8a079b3ed2531e18947cf4f3':
      exynos5: libkeymaster: add keymaster HAL for Exynos5

commit 9f78a562a4665bdd8a079b3ed2531e18947cf4f3
Merge: 2ebe83a 4d1c1ee
Author: Dima Zavin <dmitriyz@google.com>
Date:   Tue Sep 18 10:38:06 2012 -0700

    am 4d1c1eea: Merge "exynos5: libkeymaster: add keymaster HAL for Exynos5" into jb-mr1-dev

    * commit '4d1c1eea01b02737c5730a280c5348acfa348e38':
      exynos5: libkeymaster: add keymaster HAL for Exynos5

commit 1efa6c01add39433496a509fc6cea995a3da1960
Merge: 13188f8 2ebe83a
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 18 00:10:38 2012 -0700

    am 2ebe83a8: am 29da681e: exynos5: Add V4L2_CID_TV_MAX_AUDIO_CHANNELS

    * commit '2ebe83a8d700a707fd3d9b595a20c489d9060b9c':
      exynos5: Add V4L2_CID_TV_MAX_AUDIO_CHANNELS

commit 2ebe83a8d700a707fd3d9b595a20c489d9060b9c
Merge: 7565895 29da681
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 18 00:04:37 2012 -0700

    am 29da681e: exynos5: Add V4L2_CID_TV_MAX_AUDIO_CHANNELS

    * commit '29da681e8d77046054296b74de60603a9bbd7ddc':
      exynos5: Add V4L2_CID_TV_MAX_AUDIO_CHANNELS

commit 13188f811b7e29f12343d315deeb645965f712e9
Merge: 662e7a0 7565895
Author: Rebecca Zavin <rebecca@android.com>
Date:   Mon Sep 17 12:46:19 2012 -0700

    am 75658952: am 70f7a636: Merge "hardware: samsung_slsi: libcamera2: pre-capture metering bug fix" into jb-mr1-dev

    * commit '7565895240a2bd954a61a6364e02f5ac5990023f':
      hardware: samsung_slsi: libcamera2: pre-capture metering bug fix

commit 662e7a03457cc1e64e1c9accb017fdd3cccbfccd
Merge: b661b4a 2408255
Author: Rebecca Zavin <rebecca@android.com>
Date:   Mon Sep 17 12:46:19 2012 -0700

    am 24082553: am 69b45574: Merge "hardware: samsung_slsi: libcamera2: support AE and AWB state" into jb-mr1-dev

    * commit '24082553e3452cf8263fee648482a1d1197c0edc':
      hardware: samsung_slsi: libcamera2: support AE and AWB state

commit b661b4a1063e5230eeb450ea43282d0d3eb83c9d
Merge: 0436693 12b9e7d
Author: Rebecca Zavin <rebecca@android.com>
Date:   Mon Sep 17 12:46:18 2012 -0700

    am 12b9e7d3: am 297c367b: Merge "hardware: samsung_slsi: libcamera2: Use FORMAT_ZSL for stream setup" into jb-mr1-dev

    * commit '12b9e7d30fd6c02be8acc8c6c146fd76cfc88a5d':
      hardware: samsung_slsi: libcamera2: Use FORMAT_ZSL for stream setup

commit 0436693bdf7a05f9a16fe52ff637c239905affe5
Merge: 53c5b1b 2b2996b
Author: James Dong <jdong@google.com>
Date:   Mon Sep 17 12:45:42 2012 -0700

    am 2b2996b5: am 9bd45290: Merge "exynos_omx: multi_thread: Change bitrate setting in encode component." into jb-mr1-dev

    * commit '2b2996b58dd2009bf0d13ce10330472d098fd755':
      exynos_omx: multi_thread: Change bitrate setting in encode component.

commit 53c5b1b586f52734f6ff01726703629b66dabc32
Merge: 2fc403c 5ccdb25
Author: Dima Zavin <dmitriyz@google.com>
Date:   Mon Sep 17 11:29:56 2012 -0700

    am 5ccdb254: am 4b2245a1: Merge changes I054eba95,I833315b5 into jb-mr1-dev

    * commit '5ccdb254ccd1837153771eec41e0f700cc07a2c3':
      mobicore: remove useless Android.mk files
      mobicore: update MobiCore userspace daemon and libraries

commit 2fc403c9fda6ff988904107a2e695624e7bd1774
Merge: 158baad 41d4da1
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 17 11:29:38 2012 -0700

    am 41d4da1a: am ed4ad5fe: hardware: samsung_slsi: libcamera2: Modify Debug Message

    * commit '41d4da1afd2fcd64d4d802a9e194607be6aee0b0':
      hardware: samsung_slsi: libcamera2: Modify Debug Message

commit 158baadaa97cc4b26b9cdd0dd7d18601615b06fc
Merge: 1fd22a6 a070272
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Sep 17 11:29:37 2012 -0700

    am a0702728: am 66422b5e: hardware: samsung_slsi: libcamera2: remove redundant code at CAF video

    * commit 'a07027285782a3c2805591a95fd3c722389c9203':
      hardware: samsung_slsi: libcamera2: remove redundant code at CAF video

commit 1fd22a68fc3c985ac79eb78171d16e6b15a94cc0
Merge: ec385aa 0e95726
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Sep 17 11:29:36 2012 -0700

    am 0e957265: am 311d52eb: hardware: samsung_slsi: libcamera2: support infinity focus mode

    * commit '0e957265ced01be41544d1208bf33050a057cd77':
      hardware: samsung_slsi: libcamera2: support infinity focus mode

commit ec385aa2dc52ab640a3766730a49d7df42541f52
Merge: c975378 caf89b4
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Sep 17 11:29:35 2012 -0700

    am caf89b44: am 63be2dac: hardware: samsung_slsi: libcamera2: update metadata header

    * commit 'caf89b445d122f3807f24147c249ba7675b5df80':
      hardware: samsung_slsi: libcamera2: update metadata header

commit c975378084e37db2b4c91298c2809ad4299702c4
Merge: d9a8e99 cd6836b
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Mon Sep 17 10:28:39 2012 -0700

    am cd6836bb: am 5c88d1f2: hardware: samsung_slsi: libcamera2: Modify to support video stabilization(VDIS)

    * commit 'cd6836bb815e76291fc7d9e4c3187acd960994a3':
      hardware: samsung_slsi: libcamera2: Modify to support video stabilization(VDIS)

commit d9a8e99d1e54442a9fb84e79aa182e80b4a5341b
Merge: c1130e1 8573f23
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Mon Sep 17 10:28:38 2012 -0700

    am 8573f234: am f85c3f0f: hardware: samsung_slsi: libcamera2: Modify max count of face detection

    * commit '8573f234ae12e3779fb24cf28933a4005266f0d8':
      hardware: samsung_slsi: libcamera2: Modify max count of face detection

commit c1130e1e633eee4ecaf37eb8d593405c5de87e52
Merge: 454e37a 862599b
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 17 10:28:37 2012 -0700

    am 862599b5: am ac8c2060: hardware: samsung_slsi: libcamera2: Fix memory leak on exit

    * commit '862599b5277e8fe4b2d0ffa81a8a155d2eefe699':
      hardware: samsung_slsi: libcamera2: Fix memory leak on exit

commit 454e37a7dbf898b1d992ebbad017b4fb2b3490fc
Merge: 3ce4dad 96c8557
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 17 10:28:36 2012 -0700

    am 96c85573: am ce8e830a: hardware: samsung_slsi: libcamera2: Remove HACK used for frame sync

    * commit '96c85573118daf18e84b9b026e3b68840ebf85e8':
      hardware: samsung_slsi: libcamera2: Remove HACK used for frame sync

commit 3ce4dad9eda4b3b13cf0459265748247bbdd05be
Merge: eb54238 64539d7
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 17 10:28:35 2012 -0700

    am 64539d76: am 5f643a75: hardware: samsung_slsi: libcamera2: Fix video snapshot crash

    * commit '64539d76a2407ef8fd092c1f6f7f8dfd57d08d8a':
      hardware: samsung_slsi: libcamera2: Fix video snapshot crash

commit eb54238d66c4d8b82e23446627dfeff9feccc8b7
Merge: 9397c41 22139ef
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Mon Sep 17 10:28:35 2012 -0700

    am 22139efe: am 0d220b42: hardware: samsung_slsi: libcamera2: Fix the preview callback bug.

    * commit '22139efe76a75f61561d1d8fbb91d9993b289b84':
      hardware: samsung_slsi: libcamera2: Fix the preview callback bug.

commit 9397c414b61991a394fc5b76d540787dc01676aa
Merge: 7bc925b 9f59a6e
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 17 10:28:34 2012 -0700

    am 9f59a6ec: am 6bf36b60: hardware: samsung_slsi:libcamera2: Fix Night scene mode crash

    * commit '9f59a6ec8c0127d24d44f5a0d81b11b22e5ac180':
      hardware: samsung_slsi:libcamera2: Fix Night scene mode crash

commit 7bc925bd69e6489f921d62c5d90ec2c03b6a4eaf
Merge: e67eaca 1ed6180
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Sep 17 10:28:33 2012 -0700

    am 1ed61808: am e117f756: hardware: samsung_slsi: libcamera2: support pre-capture metering

    * commit '1ed6180805bdef7eab943120ac8378bc92ff95e8':
      hardware: samsung_slsi: libcamera2: support pre-capture metering

commit e67eaca731758a37e9c422c5da223dde6d059e35
Merge: dbe5020 e138fa8
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Sep 17 10:28:32 2012 -0700

    am e138fa8b: am 53f62ad9: hardware: samsung_slsi: libcamera2: support wb exif info

    * commit 'e138fa8b7212d1b9f9ee4fe763d41ddd5ea970d7':
      hardware: samsung_slsi: libcamera2: support wb exif info

commit dbe50206622f05e657eacb7dc7af6d7d7e2fda8c
Merge: 98830bc 6f3a1eb
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Sep 17 10:28:31 2012 -0700

    am 6f3a1eb8: am 5506cebf: hardware: samsung_slsi:libcamera2: Enable ZSL and frame sync

    * commit '6f3a1eb8ea759755c36af8865764eecc43731692':
      hardware: samsung_slsi:libcamera2: Enable ZSL and frame sync

commit 7565895240a2bd954a61a6364e02f5ac5990023f
Merge: 2408255 70f7a63
Author: Rebecca Zavin <rebecca@android.com>
Date:   Sat Sep 15 16:10:40 2012 -0700

    am 70f7a636: Merge "hardware: samsung_slsi: libcamera2: pre-capture metering bug fix" into jb-mr1-dev

    * commit '70f7a6368f659ffa7b3da81a21c49cb18fd319a8':
      hardware: samsung_slsi: libcamera2: pre-capture metering bug fix

commit 24082553e3452cf8263fee648482a1d1197c0edc
Merge: 12b9e7d 69b4557
Author: Rebecca Zavin <rebecca@android.com>
Date:   Sat Sep 15 16:10:40 2012 -0700

    am 69b45574: Merge "hardware: samsung_slsi: libcamera2: support AE and AWB state" into jb-mr1-dev

    * commit '69b45574a70b5cafc2b2c86136a72fcf11754fec':
      hardware: samsung_slsi: libcamera2: support AE and AWB state

commit 12b9e7d30fd6c02be8acc8c6c146fd76cfc88a5d
Merge: 2b2996b 297c367
Author: Rebecca Zavin <rebecca@android.com>
Date:   Sat Sep 15 16:10:39 2012 -0700

    am 297c367b: Merge "hardware: samsung_slsi: libcamera2: Use FORMAT_ZSL for stream setup" into jb-mr1-dev

    * commit '297c367b44bfe339f81b70f0a8f07b7417651068':
      hardware: samsung_slsi: libcamera2: Use FORMAT_ZSL for stream setup

commit 2b2996b58dd2009bf0d13ce10330472d098fd755
Merge: 5ccdb25 9bd4529
Author: James Dong <jdong@google.com>
Date:   Fri Sep 14 16:27:34 2012 -0700

    am 9bd45290: Merge "exynos_omx: multi_thread: Change bitrate setting in encode component." into jb-mr1-dev

    * commit '9bd452904dc65d478ef7391c537d845fea121eed':
      exynos_omx: multi_thread: Change bitrate setting in encode component.

commit 5ccdb254ccd1837153771eec41e0f700cc07a2c3
Merge: 41d4da1 4b2245a
Author: Dima Zavin <dmitriyz@google.com>
Date:   Fri Sep 14 14:57:05 2012 -0700

    am 4b2245a1: Merge changes I054eba95,I833315b5 into jb-mr1-dev

    * commit '4b2245a1809f09b0ec4e6c8ecd2ac626eca0d7d2':
      mobicore: remove useless Android.mk files
      mobicore: update MobiCore userspace daemon and libraries

commit 41d4da1afd2fcd64d4d802a9e194607be6aee0b0
Merge: a070272 ed4ad5f
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Sep 14 14:19:24 2012 -0700

    am ed4ad5fe: hardware: samsung_slsi: libcamera2: Modify Debug Message

    * commit 'ed4ad5fedd954a140d28263a131e066fcea66774':
      hardware: samsung_slsi: libcamera2: Modify Debug Message

commit a07027285782a3c2805591a95fd3c722389c9203
Merge: 0e95726 66422b5
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Fri Sep 14 14:19:24 2012 -0700

    am 66422b5e: hardware: samsung_slsi: libcamera2: remove redundant code at CAF video

    * commit '66422b5e6af560e5a19cb75f8b0c1037d28e0993':
      hardware: samsung_slsi: libcamera2: remove redundant code at CAF video

commit 0e957265ced01be41544d1208bf33050a057cd77
Merge: caf89b4 311d52e
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Fri Sep 14 14:19:23 2012 -0700

    am 311d52eb: hardware: samsung_slsi: libcamera2: support infinity focus mode

    * commit '311d52eb98e3de1aacdd938cf28dce9564c4a547':
      hardware: samsung_slsi: libcamera2: support infinity focus mode

commit caf89b445d122f3807f24147c249ba7675b5df80
Merge: cd6836b 63be2da
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Fri Sep 14 14:19:22 2012 -0700

    am 63be2dac: hardware: samsung_slsi: libcamera2: update metadata header

    * commit '63be2dac454f121ae105580d9c5d3e785f289ffe':
      hardware: samsung_slsi: libcamera2: update metadata header

commit cd6836bb815e76291fc7d9e4c3187acd960994a3
Merge: 8573f23 5c88d1f
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Fri Sep 14 11:07:31 2012 -0700

    am 5c88d1f2: hardware: samsung_slsi: libcamera2: Modify to support video stabilization(VDIS)

    * commit '5c88d1f2e176e716cd51df32c6835ec3b89b20e1':
      hardware: samsung_slsi: libcamera2: Modify to support video stabilization(VDIS)

commit 8573f234ae12e3779fb24cf28933a4005266f0d8
Merge: 862599b f85c3f0
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Fri Sep 14 11:07:30 2012 -0700

    am f85c3f0f: hardware: samsung_slsi: libcamera2: Modify max count of face detection

    * commit 'f85c3f0fae2469ee77bee0a6e01b6580eb12fb20':
      hardware: samsung_slsi: libcamera2: Modify max count of face detection

commit 862599b5277e8fe4b2d0ffa81a8a155d2eefe699
Merge: 96c8557 ac8c206
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Sep 14 11:07:29 2012 -0700

    am ac8c2060: hardware: samsung_slsi: libcamera2: Fix memory leak on exit

    * commit 'ac8c20603200744b8be1f15e348614ab60aaafe6':
      hardware: samsung_slsi: libcamera2: Fix memory leak on exit

commit 96c85573118daf18e84b9b026e3b68840ebf85e8
Merge: 64539d7 ce8e830
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Sep 14 11:07:28 2012 -0700

    am ce8e830a: hardware: samsung_slsi: libcamera2: Remove HACK used for frame sync

    * commit 'ce8e830a01160b297abaa5b0fcf0c88264ee9ecd':
      hardware: samsung_slsi: libcamera2: Remove HACK used for frame sync

commit 64539d76a2407ef8fd092c1f6f7f8dfd57d08d8a
Merge: 22139ef 5f643a7
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Sep 14 11:07:28 2012 -0700

    am 5f643a75: hardware: samsung_slsi: libcamera2: Fix video snapshot crash

    * commit '5f643a757bed1b08adfc47f0c0ddec474171e575':
      hardware: samsung_slsi: libcamera2: Fix video snapshot crash

commit 22139efe76a75f61561d1d8fbb91d9993b289b84
Merge: 9f59a6e 0d220b4
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Fri Sep 14 11:07:26 2012 -0700

    am 0d220b42: hardware: samsung_slsi: libcamera2: Fix the preview callback bug.

    * commit '0d220b426cd6a9541c9f1cc10ae835475583d9a5':
      hardware: samsung_slsi: libcamera2: Fix the preview callback bug.

commit 9f59a6ec8c0127d24d44f5a0d81b11b22e5ac180
Merge: 1ed6180 6bf36b6
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Sep 14 11:05:58 2012 -0700

    am 6bf36b60: hardware: samsung_slsi:libcamera2: Fix Night scene mode crash

    * commit '6bf36b609dea235201b825e95d69ab2648eeebc1':
      hardware: samsung_slsi:libcamera2: Fix Night scene mode crash

commit 1ed6180805bdef7eab943120ac8378bc92ff95e8
Merge: e138fa8 e117f75
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Fri Sep 14 11:05:57 2012 -0700

    am e117f756: hardware: samsung_slsi: libcamera2: support pre-capture metering

    * commit 'e117f7565971e9036b3c5e8dd5dd202ad6208c60':
      hardware: samsung_slsi: libcamera2: support pre-capture metering

commit e138fa8b7212d1b9f9ee4fe763d41ddd5ea970d7
Merge: 6f3a1eb 53f62ad
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Fri Sep 14 11:05:56 2012 -0700

    am 53f62ad9: hardware: samsung_slsi: libcamera2: support wb exif info

    * commit '53f62ad92ec5a5d11114420ca83cb122c38c2ef1':
      hardware: samsung_slsi: libcamera2: support wb exif info

commit 6f3a1eb8ea759755c36af8865764eecc43731692
Merge: 6a75561 5506ceb
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Sep 14 11:05:55 2012 -0700

    am 5506cebf: hardware: samsung_slsi:libcamera2: Enable ZSL and frame sync

    * commit '5506cebff05ff1356ae17fe4c30c033d2285d5f5':
      hardware: samsung_slsi:libcamera2: Enable ZSL and frame sync

commit 98830bc762db30c38398414d4840542f73088328
Merge: b3a2e8b 6a75561
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Sep 13 03:22:13 2012 -0700

    am 6a75561e: am 7dddd2a7: hwc: clear cached gscaler info after failed allocation

    * commit '6a75561ec1bf6485423142bbbe34f5f0986ae56c':
      hwc: clear cached gscaler info after failed allocation

commit b3a2e8b5ce8026390073e5e399d4dc40791982f2
Merge: d69fece 5e1777d
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Sep 13 03:21:48 2012 -0700

    am 5e1777da: am 3088b978: hwc: store gscaler configuration in correct slot

    * commit '5e1777da907d31ddf89fc103fa4a14e784717561':
      hwc: store gscaler configuration in correct slot

commit d69fececc2cc2bd8f3bf6f5f2b6d987b40411590
Merge: bf31f79 a1dcbf1
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 17:02:13 2012 -0700

    am a1dcbf10: am f9509d32: Revert "hwc: enforce bandwidth limitations on each memory interface"

    * commit 'a1dcbf10153926d7532798069eed090fb8164f94':
      Revert "hwc: enforce bandwidth limitations on each memory interface"

commit bf31f79129dfdbac70ba1e49377c20fbd888b024
Merge: 9d164b9 fbe3087
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 17:02:12 2012 -0700

    am fbe30879: am 9e6b8ca0: Revert "hwc: enable gscaler on RGBX8888 surfaces"

    * commit 'fbe3087950d199a6963fa9d05d9de9a23d67dd2f':
      Revert "hwc: enable gscaler on RGBX8888 surfaces"

commit 9d164b9279f61aeb9e1c72b37df3c57d8e5ea295
Merge: 2c698d6 71a9fa8
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Sep 12 16:58:32 2012 -0700

    am 71a9fa84: am e76fa944: Revert "libgscaler: rework configuration checking and alignment"

    * commit '71a9fa847cb2c0e734b17d7ebbf2ed5a02528328':
      Revert "libgscaler: rework configuration checking and alignment"

commit 2c698d60faf0dc19ece4b82d3838921c0702abb3
Merge: e8aba42 7a05cb4
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Sep 12 16:58:31 2012 -0700

    am 7a05cb46: am 23cd5951: Revert "hwc: rewrite supports_gscaler() to use libgscaler"

    * commit '7a05cb460e02a17ba4391f4feaabbe8120ac16c6':
      Revert "hwc: rewrite supports_gscaler() to use libgscaler"

commit 6a75561ec1bf6485423142bbbe34f5f0986ae56c
Merge: 5e1777d 7dddd2a
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 16:42:00 2012 -0700

    am 7dddd2a7: hwc: clear cached gscaler info after failed allocation

    * commit '7dddd2a7a02c1840eaed7dac79d048bacf14cd11':
      hwc: clear cached gscaler info after failed allocation

commit 5e1777da907d31ddf89fc103fa4a14e784717561
Merge: a1dcbf1 3088b97
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 16:19:01 2012 -0700

    am 3088b978: hwc: store gscaler configuration in correct slot

    * commit '3088b9786a2496f92c321aeca641898ad14b446e':
      hwc: store gscaler configuration in correct slot

commit e8aba42aeab4d8023e0b55386915258bc8f6e88c
Merge: 4e6498e 7ac34f3
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Sep 12 15:35:14 2012 -0700

    am 7ac34f37: am cbfe951b: Merge changes Ia20f32e5,I8adb05ca into jb-mr1-dev

    * commit '7ac34f37a1d448b27bf3278e0ef820ead56f968c':
      hardware: samsung_slsi:libcamera2: enable frame sync
      hardware: samsung_slsi: libcamera2: decrease the number of request entry

commit 4e6498ee31b44ec473036a06447c00e39fdb7c13
Merge: 75f1685 501d147
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Sep 12 15:35:09 2012 -0700

    am 501d147d: am e8f55d77: Merge "hardware: samsung_slsi: libcamera2: Bug fix for stop sequence" into jb-mr1-dev

    * commit '501d147df08cc753c9a3403a51eeae1e52e81f15':
      hardware: samsung_slsi: libcamera2: Bug fix for stop sequence

commit 75f16851e8747d9c60212c4d6f41b92ecc09521c
Merge: 49cf1d3 08d5276
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 15:34:53 2012 -0700

    am 08d52768: am aa14c9fb: hwc: enforce bandwidth limitations on each memory interface

    * commit '08d52768f117623f62c70a42e63470924bedad9d':
      hwc: enforce bandwidth limitations on each memory interface

commit 49cf1d362d01e718181a8a6c28ad2c9a135dcd03
Merge: f4f6d74 86ebb5e
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 15:34:52 2012 -0700

    am 86ebb5ee: am f3416d3f: hwc: rewrite supports_gscaler() to use libgscaler

    * commit '86ebb5ee0eb5ed1880260ee231c4698fc0f63ca9':
      hwc: rewrite supports_gscaler() to use libgscaler

commit f4f6d74b7f4f9032cc6e22712e312c5ada34ddc9
Merge: 5e6952a e563f52
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 15:34:50 2012 -0700

    am e563f525: am a9ea5343: libgscaler: rework configuration checking and alignment

    * commit 'e563f525aa11175efcdd642ac1fc233b21715bdb':
      libgscaler: rework configuration checking and alignment

commit 5e6952a26928826e7ca066298111c6d47a59322e
Merge: 9cbc287 94c39bc
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 15:34:50 2012 -0700

    am 94c39bcf: am 36530ec6: hwc: enable gscaler on RGBX8888 surfaces

    * commit '94c39bcf9112172d95798267febb1140c1e28fa0':
      hwc: enable gscaler on RGBX8888 surfaces

commit 9cbc287ab3bfd09f06a2956306e1a6ccd5522d35
Merge: 2ef7033 7bab780
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 15:28:54 2012 -0700

    am 7bab7809: am 29c0dc71: Merge "hwc: moved GSC dst\'s drmmode checking." into jb-mr1-dev

    * commit '7bab7809a0cdceca262e81a65d4d0eec0d61103a':
      hwc: moved GSC dst's drmmode checking.

commit 2ef7033622a8267fb0ad14905314d6042e1c139a
Merge: f98a7a4 95ed35b
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Sep 12 15:14:53 2012 -0700

    am 95ed35b1: am 4aa4d739: hardware: samsung_slsi: libcamera2: Add log level for camera debug

    * commit '95ed35b148ecd1272a7af20134ca9b8fbab8ea45':
      hardware: samsung_slsi: libcamera2: Add log level for camera debug

commit f98a7a47498938bc8d9ad50e6ee5ca64aef70dd0
Merge: e160747 9a0f2a9
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Sep 12 15:14:52 2012 -0700

    am 9a0f2a9d: am a776338e: Remove compiler warning from gralloc, fix some white space

    * commit '9a0f2a9dc121296d057f1c68bfe230811b3aa111':
      Remove compiler warning from gralloc, fix some white space

commit e1607477caba905490a88484d673579c065e0038
Merge: e3bb97f 3eee8e2
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Sep 12 15:14:51 2012 -0700

    am 3eee8e2e: am 7d5efeeb: hardware: samsung_slsi: gralloc: Support HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED

    * commit '3eee8e2e936e0f2196118ee5a576f56917aa1b97':
      hardware: samsung_slsi: gralloc: Support HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED

commit e3bb97f2be9dcd877267bc2543246a6d674b8b57
Merge: 0965cfc e62c223
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Sep 12 13:18:17 2012 -0700

    am e62c2231: am e00f6591: hardware: samsung_slsi: Add fnumber item for metadata

    * commit 'e62c2231f6dde5f97496ab5ac1d7cc0621c44a97':
      hardware: samsung_slsi: Add fnumber item for metadata

commit 0965cfc4e95826358729eb91321906ae3a3313b8
Merge: da36caf e343c41
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Sep 12 13:18:16 2012 -0700

    am e343c414: am 9257e29e: hardware: samsung_slsi: libcamera2: change flash sequence

    * commit 'e343c414fdf5f461a9931f52cca36ca4456beb8d':
      hardware: samsung_slsi: libcamera2: change flash sequence

commit da36caf3aba59f7f89015dff0c9c0ffe6c4ace33
Merge: be1519b 0c0e1a1
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Sep 12 13:18:15 2012 -0700

    am 0c0e1a15: am 2bbbf0c1: hardware: samsung_slsi: libcamera2: Recording bug fix

    * commit '0c0e1a15e06b594d7239cab882974a4fd4a99674':
      hardware: samsung_slsi: libcamera2: Recording bug fix

commit a1dcbf10153926d7532798069eed090fb8164f94
Merge: fbe3087 f9509d3
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 09:55:25 2012 -0700

    am f9509d32: Revert "hwc: enforce bandwidth limitations on each memory interface"

    * commit 'f9509d3209f37beb28b74b4f5355bfa0162b1154':
      Revert "hwc: enforce bandwidth limitations on each memory interface"

commit fbe3087950d199a6963fa9d05d9de9a23d67dd2f
Merge: 71a9fa8 9e6b8ca
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Sep 12 09:55:25 2012 -0700

    am 9e6b8ca0: Revert "hwc: enable gscaler on RGBX8888 surfaces"

    * commit '9e6b8ca0565679a6b1773d2e6e9472cb8eeb2a22':
      Revert "hwc: enable gscaler on RGBX8888 surfaces"

commit 71a9fa847cb2c0e734b17d7ebbf2ed5a02528328
Merge: 7a05cb4 e76fa94
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Sep 12 01:02:33 2012 -0700

    am e76fa944: Revert "libgscaler: rework configuration checking and alignment"

    * commit 'e76fa9446516eb7526f66d760c7a77b8dad56739':
      Revert "libgscaler: rework configuration checking and alignment"

commit 7a05cb460e02a17ba4391f4feaabbe8120ac16c6
Merge: 7ac34f3 23cd595
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Sep 12 01:02:32 2012 -0700

    am 23cd5951: Revert "hwc: rewrite supports_gscaler() to use libgscaler"

    * commit '23cd5951dcf20c282d91cd8e897f4e88c1cffcb2':
      Revert "hwc: rewrite supports_gscaler() to use libgscaler"

commit 7ac34f37a1d448b27bf3278e0ef820ead56f968c
Merge: 501d147 cbfe951
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 11 17:15:04 2012 -0700

    am cbfe951b: Merge changes Ia20f32e5,I8adb05ca into jb-mr1-dev

    * commit 'cbfe951bb8b508261fd9389ff8ca87e8a41b0316':
      hardware: samsung_slsi:libcamera2: enable frame sync
      hardware: samsung_slsi: libcamera2: decrease the number of request entry

commit 501d147df08cc753c9a3403a51eeae1e52e81f15
Merge: 08d5276 e8f55d7
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Sep 11 17:12:02 2012 -0700

    am e8f55d77: Merge "hardware: samsung_slsi: libcamera2: Bug fix for stop sequence" into jb-mr1-dev

    * commit 'e8f55d77c179e9237aefcf678acda6e0b124d73e':
      hardware: samsung_slsi: libcamera2: Bug fix for stop sequence

commit 08d52768f117623f62c70a42e63470924bedad9d
Merge: 86ebb5e aa14c9f
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 11 16:23:30 2012 -0700

    am aa14c9fb: hwc: enforce bandwidth limitations on each memory interface

    * commit 'aa14c9fba2a5790cfc249afe0cd361aef774d16b':
      hwc: enforce bandwidth limitations on each memory interface

commit 86ebb5ee0eb5ed1880260ee231c4698fc0f63ca9
Merge: e563f52 f3416d3
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 11 16:22:08 2012 -0700

    am f3416d3f: hwc: rewrite supports_gscaler() to use libgscaler

    * commit 'f3416d3fd62de43b5f15076957d94282e13b30ba':
      hwc: rewrite supports_gscaler() to use libgscaler

commit e563f525aa11175efcdd642ac1fc233b21715bdb
Merge: 94c39bc a9ea534
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 11 16:20:37 2012 -0700

    am a9ea5343: libgscaler: rework configuration checking and alignment

    * commit 'a9ea534343fd683fda86df74646b57fc95caaa78':
      libgscaler: rework configuration checking and alignment

commit 94c39bcf9112172d95798267febb1140c1e28fa0
Merge: 7bab780 36530ec
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 11 16:20:36 2012 -0700

    am 36530ec6: hwc: enable gscaler on RGBX8888 surfaces

    * commit '36530ec6d52ee39c3755e1d26f6a9ead6b41e2bb':
      hwc: enable gscaler on RGBX8888 surfaces

commit 7bab7809a0cdceca262e81a65d4d0eec0d61103a
Merge: 95ed35b 29c0dc7
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Sep 11 15:05:34 2012 -0700

    am 29c0dc71: Merge "hwc: moved GSC dst\'s drmmode checking." into jb-mr1-dev

    * commit '29c0dc712a219c3ac152b72380cd6d415ce63d5b':
      hwc: moved GSC dst's drmmode checking.

commit 95ed35b148ecd1272a7af20134ca9b8fbab8ea45
Merge: 9a0f2a9 4aa4d73
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Tue Sep 11 13:19:49 2012 -0700

    am 4aa4d739: hardware: samsung_slsi: libcamera2: Add log level for camera debug

    * commit '4aa4d73919168b1cd26a22d4b536697937259f80':
      hardware: samsung_slsi: libcamera2: Add log level for camera debug

commit 9a0f2a9dc121296d057f1c68bfe230811b3aa111
Merge: 3eee8e2 a776338
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Sep 11 13:16:21 2012 -0700

    am a776338e: Remove compiler warning from gralloc, fix some white space

    * commit 'a776338e508221131a2a51d32b9a374a906390dc':
      Remove compiler warning from gralloc, fix some white space

commit 3eee8e2e936e0f2196118ee5a576f56917aa1b97
Merge: e62c223 7d5efee
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Sep 11 13:16:20 2012 -0700

    am 7d5efeeb: hardware: samsung_slsi: gralloc: Support HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED

    * commit '7d5efeeb8590f12075e4c05976083497d9bbd078':
      hardware: samsung_slsi: gralloc: Support HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED

commit e62c2231f6dde5f97496ab5ac1d7cc0621c44a97
Merge: e343c41 e00f659
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Sep 11 10:11:54 2012 -0700

    am e00f6591: hardware: samsung_slsi: Add fnumber item for metadata

    * commit 'e00f6591f64959131a8ddfbbcec7ff36c7eee94e':
      hardware: samsung_slsi: Add fnumber item for metadata

commit e343c414fdf5f461a9931f52cca36ca4456beb8d
Merge: 0c0e1a1 9257e29
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Tue Sep 11 10:11:53 2012 -0700

    am 9257e29e: hardware: samsung_slsi: libcamera2: change flash sequence

    * commit '9257e29ea5fa955cd0c135d584c2ccc452189712':
      hardware: samsung_slsi: libcamera2: change flash sequence

commit 0c0e1a15e06b594d7239cab882974a4fd4a99674
Merge: d7b9500 2bbbf0c
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Tue Sep 11 10:11:52 2012 -0700

    am 2bbbf0c1: hardware: samsung_slsi: libcamera2: Recording bug fix

    * commit '2bbbf0c1c2e7170c99b188434147852f1de577c4':
      hardware: samsung_slsi: libcamera2: Recording bug fix

commit be1519bf7492230238d0a31343bf8dfa92a7bac8
Merge: 8afa944 d7b9500
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Mon Sep 10 17:06:47 2012 -0700

    am d7b9500a: am 0b7b757d: device: samsung_slsi: libcamera2: Add support video resolutions.

    * commit 'd7b9500a940dad4951ccd7b33f8002a0b428c6b0':
      device: samsung_slsi: libcamera2: Add support video resolutions.

commit 8afa944f3c86308034205b451be4f67287fb3ebf
Merge: 2d46ccd d805bcd
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Mon Sep 10 17:06:46 2012 -0700

    am d805bcda: am caea49e6: hardware: samsung_slsi: libcamera2: modify flash function

    * commit 'd805bcda171c40aad8c4852caadb12ffe628802c':
      hardware: samsung_slsi: libcamera2: modify flash function

commit d7b9500a940dad4951ccd7b33f8002a0b428c6b0
Merge: d805bcd 0b7b757
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Fri Sep 7 14:40:22 2012 -0700

    am 0b7b757d: device: samsung_slsi: libcamera2: Add support video resolutions.

    * commit '0b7b757d7ef65c064a1cf3bcd3738b7a242811ee':
      device: samsung_slsi: libcamera2: Add support video resolutions.

commit d805bcda171c40aad8c4852caadb12ffe628802c
Merge: d060249 caea49e
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Fri Sep 7 14:40:21 2012 -0700

    am caea49e6: hardware: samsung_slsi: libcamera2: modify flash function

    * commit 'caea49e60fd81033920e9d923f76d7c5aa8b495c':
      hardware: samsung_slsi: libcamera2: modify flash function

commit 2d46ccdb3648461f3aeb81589cdbca39a4d5abe8
Merge: 2115faf d060249
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Sep 6 16:45:37 2012 -0700

    am d0602491: am f8c24e51: hwc: warn about unexpected formats

    * commit 'd0602491d95bf1620c56058a41c2a4d19f5603ca':
      hwc: warn about unexpected formats

commit d0602491d95bf1620c56058a41c2a4d19f5603ca
Merge: 02ed07d f8c24e5
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Sep 6 16:43:29 2012 -0700

    am f8c24e51: hwc: warn about unexpected formats

    * commit 'f8c24e515ead420fa8dea96b87171447f5960e81':
      hwc: warn about unexpected formats

commit 2115fafffe262df0101e3476cc6f7a0661b00c50
Merge: c1ada1f 02ed07d
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Thu Sep 6 13:38:37 2012 -0700

    am 02ed07d7: am 9a710a45: hardware: samsung_slsi: libcamera2: update flash function

    * commit '02ed07d70fe6e60233420f61daa848fdc1b83abe':
      hardware: samsung_slsi: libcamera2: update flash function

commit c1ada1fe7e44d3d0e4ac883574a0f181f8889409
Merge: 3e099ab eb02e65
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Thu Sep 6 13:38:37 2012 -0700

    am eb02e658: am c0b6e17e: hardware: samsung_slsi: libcamera2: Fix preview delay and recording bugs

    * commit 'eb02e6586ca702e1a1a080808b658f5cf678df8b':
      hardware: samsung_slsi: libcamera2: Fix preview delay and recording bugs

commit 02ed07d70fe6e60233420f61daa848fdc1b83abe
Merge: eb02e65 9a710a4
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Thu Sep 6 13:37:03 2012 -0700

    am 9a710a45: hardware: samsung_slsi: libcamera2: update flash function

    * commit '9a710a4598b2ea5b676c2ad8ad40b9088661c366':
      hardware: samsung_slsi: libcamera2: update flash function

commit eb02e6586ca702e1a1a080808b658f5cf678df8b
Merge: 10297ad c0b6e17
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Thu Sep 6 13:37:02 2012 -0700

    am c0b6e17e: hardware: samsung_slsi: libcamera2: Fix preview delay and recording bugs

    * commit 'c0b6e17e87cb606e25526b3e66604b2e23729ad7':
      hardware: samsung_slsi: libcamera2: Fix preview delay and recording bugs

commit 3e099abc1ed0bd3233e317c239ccd5692c6f6319
Merge: e9f8fd9 10297ad
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Sep 5 21:37:29 2012 -0700

    am 10297ad9: am da7ca692: hardware: samsung_slsi: libcamera2: Fix AF and CAF transition bug

    * commit '10297ad97d31a966c6e7edf3f5b137f1fdc7eae6':
      hardware: samsung_slsi: libcamera2: Fix AF and CAF transition bug

commit e9f8fd9c168f428cb722a8e10981a492751ac94d
Merge: 13be8fe 869b699
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Sep 5 21:37:29 2012 -0700

    am 869b6995: am 181e425e: hardware: samsung_slsi: libcamera2: Change ion flag for metadata

    * commit '869b6995ccc08ce8d2e55d3d407952e0c03dd769':
      hardware: samsung_slsi: libcamera2: Change ion flag for metadata

commit 13be8fec927af5c4b81d6835e7cfd504e662e031
Merge: c45f99f 486c5d0
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Sep 5 21:37:28 2012 -0700

    am 486c5d02: am 7d0efb59: hardware: samsung_slsi: libcamera2: Fix the preview and still bugs.

    * commit '486c5d02ab089714e5cd940b07286c907df44122':
      hardware: samsung_slsi: libcamera2: Fix the preview and still bugs.

commit c45f99fbb3a6915cf77b19347db386d36e2ebad2
Merge: 297fe52 5b33d0c
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Sep 5 21:37:27 2012 -0700

    am 5b33d0ca: am a44c3365: hardware: samsung_slsi: libcamera2: Add support resolutions / wideAspect

    * commit '5b33d0caacd16d43ffdd0fdc21a3569e6306714e':
      hardware: samsung_slsi: libcamera2: Add support resolutions / wideAspect

commit 297fe522aa9e951266d160f4ca1f56da315a4e3b
Merge: fc807ba d0f3c99
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Sep 5 21:37:26 2012 -0700

    am d0f3c99e: am 308291de: hardware: samsung_slsi: libcamera2: Bug fix for digital zoom

    * commit 'd0f3c99e78e935c516a24777fef67ae4b2a445ff':
      hardware: samsung_slsi: libcamera2: Bug fix for digital zoom

commit fc807ba228225862c8ccf34b66efc74f02835b90
Merge: 32b707c bc33a80
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Sep 5 21:37:26 2012 -0700

    am bc33a80f: am b55ed664: hardware: samsung_slsi: libcamera2: Bug fixes and stability enhancements

    * commit 'bc33a80f93ccfff12317044cc1a5ae3ec53ad432':
      hardware: samsung_slsi: libcamera2: Bug fixes and stability enhancements

commit 10297ad97d31a966c6e7edf3f5b137f1fdc7eae6
Merge: 869b699 da7ca69
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Wed Sep 5 21:35:02 2012 -0700

    am da7ca692: hardware: samsung_slsi: libcamera2: Fix AF and CAF transition bug

    * commit 'da7ca692b1d0b4a7e6bc72b3bd97081b48318d05':
      hardware: samsung_slsi: libcamera2: Fix AF and CAF transition bug

commit 869b6995ccc08ce8d2e55d3d407952e0c03dd769
Merge: 486c5d0 181e425
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Sep 5 21:35:01 2012 -0700

    am 181e425e: hardware: samsung_slsi: libcamera2: Change ion flag for metadata

    * commit '181e425e6d6f304986ad5154f35034c615e94947':
      hardware: samsung_slsi: libcamera2: Change ion flag for metadata

commit 486c5d02ab089714e5cd940b07286c907df44122
Merge: 5b33d0c 7d0efb5
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Sep 5 21:35:00 2012 -0700

    am 7d0efb59: hardware: samsung_slsi: libcamera2: Fix the preview and still bugs.

    * commit '7d0efb59681f260d7bc4cf459a7a284269c6806a':
      hardware: samsung_slsi: libcamera2: Fix the preview and still bugs.

commit 5b33d0caacd16d43ffdd0fdc21a3569e6306714e
Merge: d0f3c99 a44c336
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Sep 5 21:35:00 2012 -0700

    am a44c3365: hardware: samsung_slsi: libcamera2: Add support resolutions / wideAspect

    * commit 'a44c3365bfc7ca02a8462264e3af05604eb1ebf5':
      hardware: samsung_slsi: libcamera2: Add support resolutions / wideAspect

commit d0f3c99e78e935c516a24777fef67ae4b2a445ff
Merge: bc33a80 308291d
Author: hyeonmyeong Choi <hyeon.choi@samsung.com>
Date:   Wed Sep 5 21:34:59 2012 -0700

    am 308291de: hardware: samsung_slsi: libcamera2: Bug fix for digital zoom

    * commit '308291dee65548eccf93232e60da7d8c32ad7f27':
      hardware: samsung_slsi: libcamera2: Bug fix for digital zoom

commit bc33a80f93ccfff12317044cc1a5ae3ec53ad432
Merge: 237a659 b55ed66
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Sep 5 21:34:57 2012 -0700

    am b55ed664: hardware: samsung_slsi: libcamera2: Bug fixes and stability enhancements

    * commit 'b55ed6644478926b4f46307103774e100e167025':
      hardware: samsung_slsi: libcamera2: Bug fixes and stability enhancements

commit 32b707c3c69ea82472931e4122eb0d883bedebba
Merge: 8c8e6b1 237a659
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 4 17:56:00 2012 -0700

    am 237a6594: am 4e0f168e: hwc: Fix booting with hdmi attached

    * commit '237a6594c8fad771db9363c73b89ec03d9417a1d':
      hwc: Fix booting with hdmi attached

commit 8c8e6b19b87060d10ff5f5aaf37dc5fdb28f8a35
Merge: 9d3451a bef37d7
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 4 17:54:38 2012 -0700

    am bef37d7d: am 2adeb9f5: Merge "hwc: Disable hdmi on blank" into jb-mr1-dev

    * commit 'bef37d7d724bf3a0da76daacad5a88e7049df6ff':
      hwc: Disable hdmi on blank

commit 9d3451aabbb837530851e5d1823c8fdaaa2415cf
Merge: a78ffdd 3fcf153
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 4 17:54:37 2012 -0700

    am 3fcf1533: am 65bcf01d: Merge "hwc: Add full screen video support on HDMI" into jb-mr1-dev

    * commit '3fcf1533cebbac3922e5a1260f2674a31d4f54f9':
      hwc: Add full screen video support on HDMI

commit 237a6594c8fad771db9363c73b89ec03d9417a1d
Merge: bef37d7 4e0f168
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 4 17:53:35 2012 -0700

    am 4e0f168e: hwc: Fix booting with hdmi attached

    * commit '4e0f168e3d62fd6d594c4015f2f3da4449fcbf19':
      hwc: Fix booting with hdmi attached

commit bef37d7d724bf3a0da76daacad5a88e7049df6ff
Merge: 3fcf153 2adeb9f
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 4 17:52:13 2012 -0700

    am 2adeb9f5: Merge "hwc: Disable hdmi on blank" into jb-mr1-dev

    * commit '2adeb9f5d39279b2e5928481ae8d17eea83c4196':
      hwc: Disable hdmi on blank

commit 3fcf1533cebbac3922e5a1260f2674a31d4f54f9
Merge: 1cfd3b5 65bcf01
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 4 17:52:12 2012 -0700

    am 65bcf01d: Merge "hwc: Add full screen video support on HDMI" into jb-mr1-dev

    * commit '65bcf01dc4131381bf9d604becb47925daacfbee':
      hwc: Add full screen video support on HDMI

commit a78ffdd56a3fe1808268ff273e4011d6dc747b0d
Merge: 5dcb748 1cfd3b5
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 4 17:46:04 2012 -0700

    am 1cfd3b5f: am c959dbe9: Merge "libgscaler: Update for HDMI full screen video" into jb-mr1-dev

    * commit '1cfd3b5f5bd64de2dad0f3988b0e5fdef3d0f71c':
      libgscaler: Update for HDMI full screen video

commit 1cfd3b5f5bd64de2dad0f3988b0e5fdef3d0f71c
Merge: 7fe828a c959dbe
Author: Benoit Goby <benoit@android.com>
Date:   Tue Sep 4 17:43:27 2012 -0700

    am c959dbe9: Merge "libgscaler: Update for HDMI full screen video" into jb-mr1-dev

    * commit 'c959dbe907d172b1d653b56417531005c9b789df':
      libgscaler: Update for HDMI full screen video

commit 5dcb748085b2ea9164c321a79ea5a773bc150efb
Merge: cdd875c 7fe828a
Author: Dima Zavin <dima@android.com>
Date:   Tue Sep 4 16:41:26 2012 -0700

    am 7fe828a4: am 1cd0c1be: Merge "exynos5: omx: osal: only free sharedmem buffers we allocated" into jb-mr1-dev

    * commit '7fe828a4c5088e718769504a27c6a44524661789':
      exynos5: omx: osal: only free sharedmem buffers we allocated

commit 7fe828a4c5088e718769504a27c6a44524661789
Merge: eff672f 1cd0c1b
Author: Dima Zavin <dima@android.com>
Date:   Tue Sep 4 16:39:34 2012 -0700

    am 1cd0c1be: Merge "exynos5: omx: osal: only free sharedmem buffers we allocated" into jb-mr1-dev

    * commit '1cd0c1bebd2e71dce77c56545967a4bff488ff21':
      exynos5: omx: osal: only free sharedmem buffers we allocated

commit cdd875cf4df77727c173970b88df7a986ab01e47
Merge: 8b0e51f eff672f
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Tue Sep 4 16:26:27 2012 -0700

    am eff672f7: am 2b0421d1: hardware: samsung_slsi: libcamera2: add new HAL stub

    * commit 'eff672f740a21f4dc6b2314f73275b575e697b1c':
      hardware: samsung_slsi: libcamera2: add new HAL stub

commit eff672f740a21f4dc6b2314f73275b575e697b1c
Merge: a6d0369 2b0421d
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Tue Sep 4 16:24:36 2012 -0700

    am 2b0421d1: hardware: samsung_slsi: libcamera2: add new HAL stub

    * commit '2b0421d1f00cedc1eb3be0eed4cd16be44257b3b':
      hardware: samsung_slsi: libcamera2: add new HAL stub

commit 8b0e51f2eb790ce3a45a23ccef0cddd7c2f88726
Merge: 4fe6949 a6d0369
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Sep 4 09:49:20 2012 -0700

    am a6d03693: am 1b8ef182: STOPSHIP: Turn back off exif data until we ship

    * commit 'a6d0369324a57a50615f8c6b25b330cfdc836f45':
      STOPSHIP: Turn back off exif data until we ship

commit 4fe694947a78b481609c1f167c901f37e7e3c637
Merge: 92211fa c3ece44
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Tue Sep 4 09:49:19 2012 -0700

    am c3ece443: am 6f19b6cf: hardware: smasung_slsi: libcamera2: add flash function

    * commit 'c3ece44305c2d4ad042c6a878af10247fd6b57bf':
      hardware: smasung_slsi: libcamera2: add flash function

commit a6d0369324a57a50615f8c6b25b330cfdc836f45
Merge: c3ece44 1b8ef18
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Tue Sep 4 09:47:09 2012 -0700

    am 1b8ef182: STOPSHIP: Turn back off exif data until we ship

    * commit '1b8ef182ba1049cbbcf476abb66d43094aaf65ba':
      STOPSHIP: Turn back off exif data until we ship

commit c3ece44305c2d4ad042c6a878af10247fd6b57bf
Merge: 0a806ac 6f19b6c
Author: Younghwan Joo <yhwan.joo@samsung.com>
Date:   Tue Sep 4 09:47:08 2012 -0700

    am 6f19b6cf: hardware: smasung_slsi: libcamera2: add flash function

    * commit '6f19b6cfec2e31a06fb7fc62ee0440e1e52d99fd':
      hardware: smasung_slsi: libcamera2: add flash function

commit 92211fa823a0f8976466e4d71d0f3acf779de809
Merge: 20e281b 0a806ac
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Sep 4 09:46:55 2012 -0700

    am 0a806ac4: am 2d5e6ec2: hardware: samsung_slsi: libcamera2: fix thumbnail size bug

    * commit '0a806ac465cb9f4b50f11690872e74c40d396cad':
      hardware: samsung_slsi: libcamera2: fix thumbnail size bug

commit 20e281b1defa23dde79a0f3c4db62b079b9db6f5
Merge: 0782d0d cac0845
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Sep 4 09:46:54 2012 -0700

    am cac08451: am 74d78ebe: hardware: samsung_slsi: libcamera2: Enable preview callback

    * commit 'cac08451455c5062f0fed3532711aa5e44454add':
      hardware: samsung_slsi: libcamera2: Enable preview callback

commit 0a806ac465cb9f4b50f11690872e74c40d396cad
Merge: cac0845 2d5e6ec
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Sep 4 09:44:43 2012 -0700

    am 2d5e6ec2: hardware: samsung_slsi: libcamera2: fix thumbnail size bug

    * commit '2d5e6ec2fb1a3868f882d058ebd8286be0bb6185':
      hardware: samsung_slsi: libcamera2: fix thumbnail size bug

commit cac08451455c5062f0fed3532711aa5e44454add
Merge: 3aa6e7c 74d78eb
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Sep 4 09:44:42 2012 -0700

    am 74d78ebe: hardware: samsung_slsi: libcamera2: Enable preview callback

    * commit '74d78ebea3d2d2bbcf46e7156d42f5e0450e3a9b':
      hardware: samsung_slsi: libcamera2: Enable preview callback

commit 0782d0db7abb15bd5c7c898b0a52cfa6810ea766
Merge: fd6dd75 3aa6e7c
Author: James Dong <jdong@google.com>
Date:   Thu Aug 30 15:33:30 2012 -0700

    am 3aa6e7cc: am 71eb855a: Merge "exynos_omx: multi_thread: Remove OMX Error log on init time." into jb-mr1-dev

    * commit '3aa6e7cc13a3a6f0f5f321bd6a6ab1194193007b':
      exynos_omx: multi_thread: Remove OMX Error log on init time.

commit 3aa6e7cc13a3a6f0f5f321bd6a6ab1194193007b
Merge: 71512bf 71eb855
Author: James Dong <jdong@google.com>
Date:   Thu Aug 30 15:31:51 2012 -0700

    am 71eb855a: Merge "exynos_omx: multi_thread: Remove OMX Error log on init time." into jb-mr1-dev

    * commit '71eb855a4cdcf96fee293e745fc43abfc22d1e7e':
      exynos_omx: multi_thread: Remove OMX Error log on init time.

commit fd6dd7573f6fbab9cd6c1721fb7152809b200679
Merge: f7479db 71512bf
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Aug 30 15:01:21 2012 -0700

    am 71512bf9: am c41b757c: gralloc: add extra line of padding after aligning

    * commit '71512bf9c475f7c3070a6254864baea1daa55c65':
      gralloc: add extra line of padding after aligning

commit 71512bf9c475f7c3070a6254864baea1daa55c65
Merge: 11140a5 c41b757
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Aug 30 14:58:16 2012 -0700

    am c41b757c: gralloc: add extra line of padding after aligning

    * commit 'c41b757cdf879f4a2dc4a6d6e796aa1cd76b86a9':
      gralloc: add extra line of padding after aligning

commit f7479db6119454f0774509dde3e2c2b62ff6e2fd
Merge: 88182bb 11140a5
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Aug 29 10:11:18 2012 -0700

    am 11140a5d: am 3bad845c: gralloc: make sure rgb buffers have at least 1 line of padding

    * commit '11140a5d21d827c785f0fc17459ce45f73493dc9':
      gralloc: make sure rgb buffers have at least 1 line of padding

commit 11140a5d21d827c785f0fc17459ce45f73493dc9
Merge: 66d7ac5 3bad845
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Aug 29 10:09:06 2012 -0700

    am 3bad845c: gralloc: make sure rgb buffers have at least 1 line of padding

    * commit '3bad845cb63c86caa14fb2c43af4a1187834fec4':
      gralloc: make sure rgb buffers have at least 1 line of padding

commit 88182bb58e75ae805279af1fa90287842f124e77
Merge: 62a94f4 66d7ac5
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:25:19 2012 -0700

    am 66d7ac59: am e4657e32: hardware: samsung_slsi: libcamera2: Enable 4x digital zoom

    * commit '66d7ac5951a549472c9a8d2119666c0d363cd464':
      hardware: samsung_slsi: libcamera2: Enable 4x digital zoom

commit 62a94f4e97f33bcba67de8e2b89f3951773a2455
Merge: df602b2 60ffda5
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:25:18 2012 -0700

    am 60ffda5d: am cd13bb78: hardware: samsung_slsi: libcamera2: Fix AF lockup

    * commit '60ffda5d658a12623cae2400b4283248709e66c4':
      hardware: samsung_slsi: libcamera2: Fix AF lockup

commit df602b2f44826c045bf5d7c94d430401f37a9944
Merge: 19eebb3 0eb01fc
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:25:18 2012 -0700

    am 0eb01fc8: am a15b4e3f: hardware: samsung_slsi: libcamera2: Fix Night scene mode

    * commit '0eb01fc8fbf09c1f2aa2360087244ccb22b08d4f':
      hardware: samsung_slsi: libcamera2: Fix Night scene mode

commit 19eebb3daa64e5ea80e647c6005e200933df540f
Merge: 4de209d 2b2ffb6
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:23:53 2012 -0700

    am 2b2ffb69: am feb7df4c: hardware: samsung_slsi: libcamera2: add basic function for frame sync

    * commit '2b2ffb69c3d8396cb59388e094241760a8086737':
      hardware: samsung_slsi: libcamera2: add basic function for frame sync

commit 4de209d24da607520fe26ac204affcb828ae3ad1
Merge: b3724ff aaf3f78
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:23:53 2012 -0700

    am aaf3f782: am ef6f83ca: hardware: samsung_slsi: libcamera2: remove unnessary signal

    * commit 'aaf3f7826d0239acd7943468e3306a76b4636fbc':
      hardware: samsung_slsi: libcamera2: remove unnessary signal

commit b3724ff5e9a6c4411005b2069d46c5da3c93a196
Merge: 9838d02 3cde189
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:23:51 2012 -0700

    am 3cde189e: am b6205886: hardware: samsung_slsi: libcamera2: Fix crash on back/front change

    * commit '3cde189eb5bd42ee9c32abf0bb9d6b02579268b5':
      hardware: samsung_slsi: libcamera2: Fix crash on back/front change

commit 9838d02a59c5524659b7c50344e2a20476aed192
Merge: f6f50a2 e24db93
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:23:51 2012 -0700

    am e24db930: am 86646da4: hardware: samsung_slsi: libcamera2: seperate stream thread functions

    * commit 'e24db9305ca43583287b051579e5f3a00acd6609':
      hardware: samsung_slsi: libcamera2: seperate stream thread functions

commit f6f50a2b9061b87b62e960987c0cc3b49c630518
Merge: b6aa829 2e1ba66
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:23:50 2012 -0700

    am 2e1ba66a: am 6044e509: hardware: samsung_slsi: libcamera2: Protection for sensor failure

    * commit '2e1ba66a14880800e04aafeeddef42d39b365d2d':
      hardware: samsung_slsi: libcamera2: Protection for sensor failure

commit b6aa829bfb3d8be3382795f9128ee31a31044cf0
Merge: 259a5de e64d914
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:23:49 2012 -0700

    am e64d9140: am 8e2c2fdb: hardware: samsung_slsi: libcamera2: Enabled Touch Auto Focus

    * commit 'e64d91407e0bf00eba54ddcc83fbc6b037076e64':
      hardware: samsung_slsi: libcamera2: Enabled Touch Auto Focus

commit 259a5de9cf4e0455c71079f8ad000b75a19b60b0
Merge: 8c545d2 1f51dc1
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:23:48 2012 -0700

    am 1f51dc1b: am fd2d78a2: hardware: samsung_slsi: libcamera2: Enabled Face Detection

    * commit '1f51dc1b401b4048e90fa13f97e41659df6e363b':
      hardware: samsung_slsi: libcamera2: Enabled Face Detection

commit 8c545d294fe1e0d2ece7c34bd11458d4c6ba4cc3
Merge: d685f3a 76947be
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:23:48 2012 -0700

    am 76947be0: am 2a21f1bf: hardware: samsung_slsi: libcamera2: removing dummy qbuf to ISP

    * commit '76947be0fd5693dc42bc515ad17da705e6ab9848':
      hardware: samsung_slsi: libcamera2: removing dummy qbuf to ISP

commit 66d7ac5951a549472c9a8d2119666c0d363cd464
Merge: 60ffda5 e4657e3
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:22:42 2012 -0700

    am e4657e32: hardware: samsung_slsi: libcamera2: Enable 4x digital zoom

    * commit 'e4657e32d8ce4a88f2c15de1de60e27f3d1778ab':
      hardware: samsung_slsi: libcamera2: Enable 4x digital zoom

commit 60ffda5d658a12623cae2400b4283248709e66c4
Merge: 0eb01fc cd13bb7
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:22:42 2012 -0700

    am cd13bb78: hardware: samsung_slsi: libcamera2: Fix AF lockup

    * commit 'cd13bb789c481cac426d64da53c0d1f74bb98ea2':
      hardware: samsung_slsi: libcamera2: Fix AF lockup

commit 0eb01fc8fbf09c1f2aa2360087244ccb22b08d4f
Merge: 2b2ffb6 a15b4e3
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:22:41 2012 -0700

    am a15b4e3f: hardware: samsung_slsi: libcamera2: Fix Night scene mode

    * commit 'a15b4e3ffb3e1822af22ccbfab876c3b0e2dbf08':
      hardware: samsung_slsi: libcamera2: Fix Night scene mode

commit 2b2ffb69c3d8396cb59388e094241760a8086737
Merge: aaf3f78 feb7df4
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:21:18 2012 -0700

    am feb7df4c: hardware: samsung_slsi: libcamera2: add basic function for frame sync

    * commit 'feb7df4c2d6e953395eef7b4389ab2e142df9613':
      hardware: samsung_slsi: libcamera2: add basic function for frame sync

commit aaf3f7826d0239acd7943468e3306a76b4636fbc
Merge: 3cde189 ef6f83c
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:21:17 2012 -0700

    am ef6f83ca: hardware: samsung_slsi: libcamera2: remove unnessary signal

    * commit 'ef6f83cab5a08acda2584cfbff2751325b5e435e':
      hardware: samsung_slsi: libcamera2: remove unnessary signal

commit 3cde189eb5bd42ee9c32abf0bb9d6b02579268b5
Merge: e24db93 b620588
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:21:16 2012 -0700

    am b6205886: hardware: samsung_slsi: libcamera2: Fix crash on back/front change

    * commit 'b62058861d4c8181d548c2516b06fec48d2f6c1b':
      hardware: samsung_slsi: libcamera2: Fix crash on back/front change

commit e24db9305ca43583287b051579e5f3a00acd6609
Merge: 2e1ba66 86646da
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:21:16 2012 -0700

    am 86646da4: hardware: samsung_slsi: libcamera2: seperate stream thread functions

    * commit '86646da4ec54337c658278271ee5cbfcde9165d6':
      hardware: samsung_slsi: libcamera2: seperate stream thread functions

commit 2e1ba66a14880800e04aafeeddef42d39b365d2d
Merge: e64d914 6044e50
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:21:15 2012 -0700

    am 6044e509: hardware: samsung_slsi: libcamera2: Protection for sensor failure

    * commit '6044e50955303fde3b50a2758df721b29addbd98':
      hardware: samsung_slsi: libcamera2: Protection for sensor failure

commit e64d91407e0bf00eba54ddcc83fbc6b037076e64
Merge: 1f51dc1 8e2c2fd
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:21:14 2012 -0700

    am 8e2c2fdb: hardware: samsung_slsi: libcamera2: Enabled Touch Auto Focus

    * commit '8e2c2fdbd940265e8413d512c3a0549bbc53c8a2':
      hardware: samsung_slsi: libcamera2: Enabled Touch Auto Focus

commit 1f51dc1b401b4048e90fa13f97e41659df6e363b
Merge: 76947be fd2d78a
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:21:14 2012 -0700

    am fd2d78a2: hardware: samsung_slsi: libcamera2: Enabled Face Detection

    * commit 'fd2d78a2d270f85a71578423e1f2b4f99fd99216':
      hardware: samsung_slsi: libcamera2: Enabled Face Detection

commit 76947be0fd5693dc42bc515ad17da705e6ab9848
Merge: a6119a9 2a21f1b
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Aug 29 00:21:13 2012 -0700

    am 2a21f1bf: hardware: samsung_slsi: libcamera2: removing dummy qbuf to ISP

    * commit '2a21f1bfa4866124cea0d37f3f71ecf040425812':
      hardware: samsung_slsi: libcamera2: removing dummy qbuf to ISP

commit d685f3a92fe275c8f539788580ecb9a37c6502e9
Merge: e85e13e a6119a9
Author: Alex Ray <aray@google.com>
Date:   Tue Aug 28 13:01:55 2012 -0700

    am a6119a9f: am 5a92f77a: STOPSHIP libcamera2: remove device metadata

    * commit 'a6119a9f96f218b42b2ab9071276359def19aeb4':
      STOPSHIP libcamera2: remove device metadata

commit e85e13e07a624a351f3ca4c19b5df17b65904ef4
Merge: a297ed7 4141d6a
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Aug 28 13:01:54 2012 -0700

    am 4141d6a8: (-s ours) am 36c106c9: hardware: samsung_slsi: libcamera2: Modified CAF Algorithm

    * commit '4141d6a8b0343ae3b428637aed5f48649a08baa2':
      hardware: samsung_slsi: libcamera2: Modified CAF Algorithm

commit a297ed78ea5ab227a1f054107eb27e5aab46381e
Merge: dc81c28 cac8fba
Author: James Dong <jdong@google.com>
Date:   Tue Aug 28 12:12:16 2012 -0700

    resolved conflicts for merge of cac8fbad to master

    Change-Id: Ie5b30dd49327d69a1297f10ec31441d37bba9cd6

commit dc81c283488bf50418c00280158be59702f34271
Merge: 8fa96d8 048eb0e
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Aug 28 09:47:12 2012 -0700

    am 048eb0ea: am 15fd8231: hardware: samsung_slsi: libcamera2: Stability Enhancement

    * commit '048eb0ea8070d63e4920d7bad69b38a56ca47a84':
      hardware: samsung_slsi: libcamera2: Stability Enhancement

commit a6119a9f96f218b42b2ab9071276359def19aeb4
Merge: 4141d6a 5a92f77
Author: Alex Ray <aray@google.com>
Date:   Tue Aug 28 09:44:48 2012 -0700

    am 5a92f77a: STOPSHIP libcamera2: remove device metadata

    * commit '5a92f77ab12f5fed504207ab7d10d682d38a7806':
      STOPSHIP libcamera2: remove device metadata

commit 4141d6a8b0343ae3b428637aed5f48649a08baa2
Merge: cac8fba 36c106c
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Aug 28 09:44:48 2012 -0700

    am 36c106c9: hardware: samsung_slsi: libcamera2: Modified CAF Algorithm

    * commit '36c106c906c67fec0d0b36e2e967312ce99dcc9e':
      hardware: samsung_slsi: libcamera2: Modified CAF Algorithm

commit cac8fbad0702ef88ff32d4d96df57a9f51489494
Merge: 048eb0e eed7ed1
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Aug 28 09:44:47 2012 -0700

    am eed7ed1b: hardware: samsung_slsi: libcamera2: Fixed JPEG related problems

    * commit 'eed7ed1bffb083b112a3366e740ebdc186203afa':
      hardware: samsung_slsi: libcamera2: Fixed JPEG related problems

commit 048eb0ea8070d63e4920d7bad69b38a56ca47a84
Merge: 26822f2 15fd823
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Aug 28 09:44:46 2012 -0700

    am 15fd8231: hardware: samsung_slsi: libcamera2: Stability Enhancement

    * commit '15fd82319b9d931a31f40c504d3acbc7e62d4ced':
      hardware: samsung_slsi: libcamera2: Stability Enhancement

commit 8fa96d8e92b0a2655032a9626b2dd57c7b8fd6f4
Merge: cbc7f27 26822f2
Author: James Dong <jdong@google.com>
Date:   Tue Aug 28 08:24:41 2012 -0700

    am 26822f26: am 64c7d6b7: Merge "exynos_omx: multi_thread: Change Log Message." into jb-mr1-dev

    * commit '26822f26e9dd3c2295550eea61b1fc77a6110944':
      exynos_omx: multi_thread: Change Log Message.

commit cbc7f27fcf61cf5ac8ae7c82dec09bf7a63492e4
Merge: c23d781 0686bd2
Author: James Dong <jdong@google.com>
Date:   Tue Aug 28 08:24:40 2012 -0700

    am 0686bd2b: am e6d1a00f: Merge "exynos_omx: multi_thread: Fix the bug of video recording I-frame interval." into jb-mr1-dev

    * commit '0686bd2bb79e9be66c12f2306b1093b23330cac0':
      exynos_omx: multi_thread: Fix the bug of video recording I-frame interval.

commit c23d7818021f7dbafadd9246d76b6046bb52a1f4
Merge: c769d14 f36aa4b
Author: James Dong <jdong@google.com>
Date:   Tue Aug 28 08:24:39 2012 -0700

    am f36aa4bd: am 7c9c6a4c: Merge "exynos_omx: multi_thread: Fix wrong variable name." into jb-mr1-dev

    * commit 'f36aa4bda2b95be5713059f53b80d1a04f292d21':
      exynos_omx: multi_thread: Fix wrong variable name.

commit 26822f26e9dd3c2295550eea61b1fc77a6110944
Merge: 0686bd2 64c7d6b
Author: James Dong <jdong@google.com>
Date:   Tue Aug 28 08:22:21 2012 -0700

    am 64c7d6b7: Merge "exynos_omx: multi_thread: Change Log Message." into jb-mr1-dev

    * commit '64c7d6b7b09a3991bdf6631bd47e9e34cca95d4c':
      exynos_omx: multi_thread: Change Log Message.

commit 0686bd2bb79e9be66c12f2306b1093b23330cac0
Merge: f36aa4b e6d1a00
Author: James Dong <jdong@google.com>
Date:   Tue Aug 28 08:22:20 2012 -0700

    am e6d1a00f: Merge "exynos_omx: multi_thread: Fix the bug of video recording I-frame interval." into jb-mr1-dev

    * commit 'e6d1a00ff3d44035bb31cca81d614eeea9676390':
      exynos_omx: multi_thread: Fix the bug of video recording I-frame interval.

commit f36aa4bda2b95be5713059f53b80d1a04f292d21
Merge: dd4d730 7c9c6a4
Author: James Dong <jdong@google.com>
Date:   Tue Aug 28 08:22:19 2012 -0700

    am 7c9c6a4c: Merge "exynos_omx: multi_thread: Fix wrong variable name." into jb-mr1-dev

    * commit '7c9c6a4c86f470b268caefd7604a7dd2305069d2':
      exynos_omx: multi_thread: Fix wrong variable name.

commit c769d149700da0dbfc248fcac431ba30f07e7a4d
Merge: 2c6bb7a dd4d730
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 28 00:44:47 2012 -0700

    am dd4d7309: am 7bd58627: hwc: support drm video play back.

    * commit 'dd4d7309b51d8174831bc0b6bdecf6dc377ba022':
      hwc: support drm video play back.

commit 2c6bb7a091ec843bc4ccf1b3a290bffda6ef3230
Merge: 4c016c2 18cb61d
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 28 00:44:47 2012 -0700

    am 18cb61d8: am 0db2e831: libgscaler: support gsc\'s content protection ctrl.

    * commit '18cb61d84fedaeda3cee577a61d3770ccd591dd5':
      libgscaler: support gsc's content protection ctrl.

commit 4c016c2b7840757c122e946601d6087681e16b8e
Merge: 3e02385 fcb4db8
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 28 00:44:46 2012 -0700

    am fcb4db8a: am fb9cad36: exynos5: include: vb2: added V4L2_CID_CONTENT_PROTECTION.

    * commit 'fcb4db8afa85620616b25ffe75a945307a6b1a9f':
      exynos5: include: vb2: added V4L2_CID_CONTENT_PROTECTION.

commit 3e02385db6de0efc57ebd8e6be6e293d748425b1
Merge: 033e5d7 f68bb1b
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 28 00:44:45 2012 -0700

    am f68bb1bf: am 788e20df: gralloc: add support to allocate protected buffers

    * commit 'f68bb1bf641c29b7485c93852980526bf7bb2f35':
      gralloc: add support to allocate protected buffers

commit dd4d7309b51d8174831bc0b6bdecf6dc377ba022
Merge: 18cb61d 7bd5862
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 28 00:42:32 2012 -0700

    am 7bd58627: hwc: support drm video play back.

    * commit '7bd58627f6422d26e4a1d053a84aba8835bff359':
      hwc: support drm video play back.

commit 18cb61d84fedaeda3cee577a61d3770ccd591dd5
Merge: fcb4db8 0db2e83
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 28 00:42:31 2012 -0700

    am 0db2e831: libgscaler: support gsc\'s content protection ctrl.

    * commit '0db2e831e9e35fdb6b94fb0ad8454899865767cd':
      libgscaler: support gsc's content protection ctrl.

commit fcb4db8afa85620616b25ffe75a945307a6b1a9f
Merge: f68bb1b fb9cad3
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 28 00:42:30 2012 -0700

    am fb9cad36: exynos5: include: vb2: added V4L2_CID_CONTENT_PROTECTION.

    * commit 'fb9cad36b81b70a0adff59dfd5145563a5871614':
      exynos5: include: vb2: added V4L2_CID_CONTENT_PROTECTION.

commit f68bb1bf641c29b7485c93852980526bf7bb2f35
Merge: 0be7753 788e20d
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 28 00:42:29 2012 -0700

    am 788e20df: gralloc: add support to allocate protected buffers

    * commit '788e20df8364770ea8bca955d6c9d4da55b494ef':
      gralloc: add support to allocate protected buffers

commit 033e5d74d4f834489c06c63e4fa8949f1b2e299a
Merge: c182db2 0be7753
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Mon Aug 27 23:05:58 2012 -0700

    am 0be77534: am bcf29611: Fix whitespace in gralloc.cpp and mapper.cpp

    * commit '0be775345fd6014416ad14120b63db784ee1a44a':
      Fix whitespace in gralloc.cpp and mapper.cpp

commit c182db2e6b11719665acd9f39ae6a2858e073aae
Merge: 097b951 5f7ed66
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Mon Aug 27 23:05:57 2012 -0700

    am 5f7ed664: am 55a3039b: Add framework yv12 and nv21 formats to gralloc

    * commit '5f7ed664500457532f7eb77282b6663dd474d607':
      Add framework yv12 and nv21 formats to gralloc

commit 097b951db392c4c9a37af391a04fa800ba936c49
Merge: 1d47061 81199fe
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Mon Aug 27 23:05:56 2012 -0700

    am 81199fee: am ec68ab21: Import ion handles when registering buffers

    * commit '81199fee9cbba11c9738c7d11a3e79e37edc1ba7':
      Import ion handles when registering buffers

commit 0be775345fd6014416ad14120b63db784ee1a44a
Merge: 5f7ed66 bcf2961
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Mon Aug 27 22:51:11 2012 -0700

    am bcf29611: Fix whitespace in gralloc.cpp and mapper.cpp

    * commit 'bcf29611227fe5d7d34061b2b8a05f59ead56ac7':
      Fix whitespace in gralloc.cpp and mapper.cpp

commit 5f7ed664500457532f7eb77282b6663dd474d607
Merge: 81199fe 55a3039
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Mon Aug 27 22:49:44 2012 -0700

    am 55a3039b: Add framework yv12 and nv21 formats to gralloc

    * commit '55a3039bed7dbb6694c0bfcd3bb621be3ab955db':
      Add framework yv12 and nv21 formats to gralloc

commit 81199fee9cbba11c9738c7d11a3e79e37edc1ba7
Merge: aa229c4 ec68ab2
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Mon Aug 27 22:49:43 2012 -0700

    am ec68ab21: Import ion handles when registering buffers

    * commit 'ec68ab2185767df2f9487f6501a5ef8d18ce1741':
      Import ion handles when registering buffers

commit 1d47061ad52ca8f85ccd22e891f9427d020d9a0f
Author: Alex Ray <aray@google.com>
Date:   Mon Aug 27 17:23:41 2012 -0700

    STOPSHIP libcamera2: remove device metadata

    Change-Id: I358b77b8a18d8a7dc76823b905a0930df845f743
    Signed-off-by: Alex Ray <aray@google.com>

commit 9900d0c43a5497dcc7e8aee78fa00aa1a5f95d51
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Thu Aug 23 17:38:20 2012 -0700

    hardware: samsung_slsi: libcamera2: Modified CAF Algorithm

    Modified CAF Algorithm and fixed lockup during operation.

    Change-Id: I313171d13414825d3bce1e12c1b123a1922b2296
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

commit 54f4971e15c4d5b5aa2074ebbe51b7d7ec2ba303
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Thu Aug 23 16:35:08 2012 -0700

    hardware: samsung_slsi: libcamera2: Fixed JPEG related problems

    1. Fixes crash after capturing multiple snapshots
    2. Supports EXIF tags
    3. Supports Thumbnails

    Change-Id: I60fed4eb64ffbb2c49ceaafb44877d5e23da8562
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

commit 6d8e5b08513b7f799ec655dbc10239b592bdc3cb
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Thu Aug 23 16:16:44 2012 -0700

    hardware: samsung_slsi: libcamera2: Stability Enhancement

    Also added supported resolutions

    Change-Id: Ie53adbbfd3b115811625ca85df05c370074107e6
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

commit 106b344e26eb6f7ba99afa0e9c881c8ec3d51219
Merge: 80b4a88 aa229c4
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 27 15:17:16 2012 -0700

    am aa229c43: am 600867e7: hwc: implement dump() with last configuration accepted by fb driver

    * commit 'aa229c43d650ea955d06e509a372a25687f0167c':
      hwc: implement dump() with last configuration accepted by fb driver

commit aa229c43d650ea955d06e509a372a25687f0167c
Merge: 812fd99 600867e
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 27 15:13:35 2012 -0700

    am 600867e7: hwc: implement dump() with last configuration accepted by fb driver

    * commit '600867e7481266f7e3f227da275f544d3ff7d72a':
      hwc: implement dump() with last configuration accepted by fb driver

commit 80b4a8855fa72f01ddd965bc342fe872ace8596b
Merge: 004d600 812fd99
Author: James Dong <jdong@google.com>
Date:   Sun Aug 26 15:00:45 2012 -0700

    am 812fd99c: am 2630679a: Reduce the number of advertised buffers needed from producer (hal) end

    * commit '812fd99cc8b58741293b2e875e462780d8187219':
      Reduce the number of advertised buffers needed from producer (hal) end

commit 812fd99cc8b58741293b2e875e462780d8187219
Merge: ce1e52d 2630679
Author: James Dong <jdong@google.com>
Date:   Sun Aug 26 14:59:22 2012 -0700

    am 2630679a: Reduce the number of advertised buffers needed from producer (hal) end

    * commit '2630679ac039ac95cfb0e8f77aefc3fae1df80cb':
      Reduce the number of advertised buffers needed from producer (hal) end

commit 004d6007f227f779c46613a8a3474e561892fd02
Merge: e3e081c ce1e52d
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Aug 23 12:57:47 2012 -0700

    am ce1e52db: am c853be7b: Disambiguate framework formats from exynos formats

    * commit 'ce1e52dba32ccc0c819f3f468d626de278790eeb':
      Disambiguate framework formats from exynos formats

commit ce1e52dba32ccc0c819f3f468d626de278790eeb
Merge: a9b4cd3 c853be7
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Aug 23 12:55:06 2012 -0700

    am c853be7b: Disambiguate framework formats from exynos formats

    * commit 'c853be7b9977a6a0402bd5a65c0c32ac9e2fde1d':
      Disambiguate framework formats from exynos formats

commit e3e081c0a52144e61cfc3e9b2d280e3b92cc2457
Merge: 0eff0bb a9b4cd3
Author: Jesse Hall <jessehall@google.com>
Date:   Thu Aug 23 09:20:06 2012 -0700

    am a9b4cd39: am da5a71d4: Update for cleanups in hwc interface

    * commit 'a9b4cd399b164b4b3fa13804356e974191116778':
      Update for cleanups in hwc interface

commit a9b4cd399b164b4b3fa13804356e974191116778
Merge: 1de9e7a da5a71d
Author: Jesse Hall <jessehall@google.com>
Date:   Thu Aug 23 09:18:21 2012 -0700

    am da5a71d4: Update for cleanups in hwc interface

    * commit 'da5a71d42af7add8e6ab5c56cf31e5dc89a80f6c':
      Update for cleanups in hwc interface

commit 0eff0bbd9cd46fe2243b9e08d91bd5195b861914
Merge: a8dc816 1de9e7a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 22 15:39:51 2012 -0700

    am 1de9e7a1: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '1de9e7a1b71c6c1c6444481ce5974aa41590ad80':
      hwc: fix set() with zero layers

commit 1de9e7a1b71c6c1c6444481ce5974aa41590ad80
Merge: 5579d43 9a5d6af
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 22 15:35:43 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ic5c49b1145c9ddb97317b0d83b58f3c68b531cde

commit a8dc81667531c3b55a16df4ff4a49377fabf2c4d
Merge: f1637a4 5579d43
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Aug 22 12:32:24 2012 -0700

    am 5579d43d: am 0fbe1706: hwc: fix set() with zero layers

    * commit '5579d43d7edfce0792f2d7acc728980f65adcb86':
      hwc: fix set() with zero layers

commit 5579d43d7edfce0792f2d7acc728980f65adcb86
Merge: 2bfd2f7 0fbe170
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Aug 22 12:30:39 2012 -0700

    am 0fbe1706: hwc: fix set() with zero layers

    * commit '0fbe1706499c5d1c48b3c97669be79c5e6213cef':
      hwc: fix set() with zero layers

commit f1637a45405a101a52cbded15b214ad81666483e
Merge: 8f25f2e 2bfd2f7
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Aug 22 01:01:23 2012 -0700

    am 2bfd2f73: am 4ed2f103: Turn off verbose logging

    * commit '2bfd2f73aa59e70f8a474018b6f07a1cc090e137':
      Turn off verbose logging

commit 2bfd2f73aa59e70f8a474018b6f07a1cc090e137
Merge: da19813 4ed2f10
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Aug 22 01:00:34 2012 -0700

    am 4ed2f103: Turn off verbose logging

    * commit '4ed2f10326c52005dffdbfdc890f9c31f5a06dc7':
      Turn off verbose logging

commit 8f25f2e2fd5486017b95e92446edda2b49045708
Merge: 6749c3a da19813
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Aug 21 23:51:00 2012 -0700

    am da198138: am 6654c251: Merge changes I52e67161,I97547674,If04eb3af,I5e3dd4f1,I8dddc167 into jb-mr1-dev

    * commit 'da198138ce98431362c38fe094dcfc09091bbc3a':
      hardware: samsung_slsi: libcamera2: Add SceneMode support
      hardware: samsung_slsi: libcamera2: Add AF/CAF Feature
      hardware: samsung_slsi: libcamera2: 4th release of camera
      hardware: samsung_slsi: libcamera2: Remove memcpy for JPEG output
      hardware: samsung_slsi: libcamera2: Add support for metadata

commit da198138ce98431362c38fe094dcfc09091bbc3a
Merge: 52a1f67 6654c25
Author: Rebecca Zavin <rebecca@android.com>
Date:   Tue Aug 21 23:50:13 2012 -0700

    am 6654c251: Merge changes I52e67161,I97547674,If04eb3af,I5e3dd4f1,I8dddc167 into jb-mr1-dev

    * commit '6654c251cc67f47ecd211ab4a77403c247ac11fe':
      hardware: samsung_slsi: libcamera2: Add SceneMode support
      hardware: samsung_slsi: libcamera2: Add AF/CAF Feature
      hardware: samsung_slsi: libcamera2: 4th release of camera
      hardware: samsung_slsi: libcamera2: Remove memcpy for JPEG output
      hardware: samsung_slsi: libcamera2: Add support for metadata

commit 6749c3ab2bccb935afb0e585381860583543880e
Merge: 8d086e0 52a1f67
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 21 16:09:44 2012 -0700

    am 52a1f677: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '52a1f677caa5f0c755b5cca27aa26a0d15628891':

commit 52a1f677caa5f0c755b5cca27aa26a0d15628891
Merge: cf904cc 33d953c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 21 16:06:18 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I1a8c0f7422f30df9ba6cb426dda1b41289b64a4b

commit 8d086e0493b3fe330dc4976b5e95f2d3db28a3cc
Merge: 06fb15b cf904cc
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 20 09:45:07 2012 -0700

    am cf904cc1: am eba34a93: hwc: use vstride to determine gscaler support

    * commit 'cf904cc18772cc4a2db16769703ccd0aa8cc2f69':
      hwc: use vstride to determine gscaler support

commit 06fb15b299809798864dea9d2166dde6bbe65668
Merge: 40cbe48 28a60db
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 20 09:45:06 2012 -0700

    am 28a60db3: am 2ddbc743: HACK: hwc: reserve gscalers 1 & 2 for camera

    * commit '28a60db387bdf336355062b502be3523d402a023':
      HACK: hwc: reserve gscalers 1 & 2 for camera

commit 40cbe48e402115a943472383ade30cbaf844c61d
Merge: aaa13d6 4866a4e
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 20 09:45:06 2012 -0700

    am 4866a4e1: am 77cbbd6f: Revert "HACK: hwc: reserve gscaler 2 for camera"

    * commit '4866a4e1e39adfdccad35e8e272dd775b9ec7762':
      Revert "HACK: hwc: reserve gscaler 2 for camera"

commit cf904cc18772cc4a2db16769703ccd0aa8cc2f69
Merge: 28a60db eba34a9
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 20 09:40:06 2012 -0700

    am eba34a93: hwc: use vstride to determine gscaler support

    * commit 'eba34a93004e81973d22d7523a0edf3eb79b8445':
      hwc: use vstride to determine gscaler support

commit 28a60db387bdf336355062b502be3523d402a023
Merge: 4866a4e 2ddbc74
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 20 09:40:06 2012 -0700

    am 2ddbc743: HACK: hwc: reserve gscalers 1 & 2 for camera

    * commit '2ddbc743328b3f4367599e8802934efcaa5e265d':
      HACK: hwc: reserve gscalers 1 & 2 for camera

commit 4866a4e1e39adfdccad35e8e272dd775b9ec7762
Merge: 91b05eb 77cbbd6
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 20 09:40:05 2012 -0700

    am 77cbbd6f: Revert "HACK: hwc: reserve gscaler 2 for camera"

    * commit '77cbbd6fb8086c0e9f39781fcb883d5e5693f84d':
      Revert "HACK: hwc: reserve gscaler 2 for camera"

commit aaa13d652b5230e4550c947b4cca1f69229e05c1
Merge: 9b41979 91b05eb
Author: Greg Hackmann <ghackmann@google.com>
Date:   Fri Aug 17 12:17:44 2012 -0700

    am 91b05eb3: am 90219f32: hwc: fix source crop when using gscaler m2m

    * commit '91b05eb35f2d319048be55107fa9a9802521832c':
      hwc: fix source crop when using gscaler m2m

commit 91b05eb35f2d319048be55107fa9a9802521832c
Merge: 38f3e55 90219f3
Author: Greg Hackmann <ghackmann@google.com>
Date:   Fri Aug 17 12:15:40 2012 -0700

    am 90219f32: hwc: fix source crop when using gscaler m2m

    * commit '90219f32a19cfaa1c24673452e9f33cccc092e21':
      hwc: fix source crop when using gscaler m2m

commit 9b41979bc9edb583f0c9fc64d68714b730cbcf2b
Merge: 2dfdaa5 38f3e55
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 16 19:12:56 2012 -0700

    am 38f3e55b: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '38f3e55b9ae391386fcba63999d183b28a52d938':

commit 38f3e55b9ae391386fcba63999d183b28a52d938
Merge: c553b1b 9345558
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 16 19:10:45 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib4851e0c676c3565052cf5b99f55aa3860dedf78

commit 2dfdaa536a3e741a05219df1d4952fc4c300ab15
Merge: 337c0ee c553b1b
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Aug 16 16:07:31 2012 -0700

    am c553b1b1: am 1cf195be: hwc: remove SKIP_LAYER check when reserving windows

    * commit 'c553b1b102ed0a09791dd4e6d16196608d39078f':
      hwc: remove SKIP_LAYER check when reserving windows

commit 337c0eeb21aa31168e74e6e94322649bdc8888dd
Merge: 3f0b0c8 e541f8e
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Aug 16 16:05:55 2012 -0700

    am e541f8e4: am b01cd33b: Merge "hwc: support blending" into jb-mr1-dev

    * commit 'e541f8e4ffdc7448dc888085a59d661c18597817':
      hwc: support blending

commit c553b1b102ed0a09791dd4e6d16196608d39078f
Merge: e541f8e 1cf195b
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Aug 16 16:05:15 2012 -0700

    am 1cf195be: hwc: remove SKIP_LAYER check when reserving windows

    * commit '1cf195be9d313c1696a8617646bb1b3327dc4592':
      hwc: remove SKIP_LAYER check when reserving windows

commit e541f8e4ffdc7448dc888085a59d661c18597817
Merge: 42f0956 b01cd33
Author: Greg Hackmann <ghackmann@google.com>
Date:   Thu Aug 16 16:03:35 2012 -0700

    am b01cd33b: Merge "hwc: support blending" into jb-mr1-dev

    * commit 'b01cd33b8e98017e3d1f092e7cf0e8cae5cb6b93':
      hwc: support blending

commit 3f0b0c8f6c7aa534333ee9b8d56b99bce5688b56
Merge: b09f613 42f0956
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Aug 16 12:39:13 2012 -0700

    am 42f0956b: am da3d8712: gralloc: Store the usage flags in the gralloc handles

    * commit '42f0956b136c8954ee67dc3b18d53f74b2a4ea67':
      gralloc: Store the usage flags in the gralloc handles

commit 42f0956b136c8954ee67dc3b18d53f74b2a4ea67
Merge: 0926e88 da3d871
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Thu Aug 16 12:37:20 2012 -0700

    am da3d8712: gralloc: Store the usage flags in the gralloc handles

    * commit 'da3d871233c291dd2c472c4a7f6bfe35e7c06fc9':
      gralloc: Store the usage flags in the gralloc handles

commit b09f61364b52df0601a6b9ef664f2f5486b7ca6d
Merge: 3836a5d 0926e88
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Aug 15 12:50:13 2012 -0700

    am 0926e887: am 70212e56: gralloc: Add vstride to gralloc handles, pad rgb surfaces

    * commit '0926e88728c87dbc31a7655b3803e80043edc191':
      gralloc: Add vstride to gralloc handles, pad rgb surfaces

commit 0926e88728c87dbc31a7655b3803e80043edc191
Merge: f1ff1e8 70212e5
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Aug 15 12:48:05 2012 -0700

    am 70212e56: gralloc: Add vstride to gralloc handles, pad rgb surfaces

    * commit '70212e566f17b06d5ce613ab5ef1204334f03b86':
      gralloc: Add vstride to gralloc handles, pad rgb surfaces

commit 3836a5d82d6645b649328a56e092f646c9df6787
Merge: 36c98d6 f1ff1e8
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Aug 15 11:56:39 2012 -0700

    am f1ff1e8b: am 2480eccc: Move gralloc from vendor to here

    * commit 'f1ff1e8b8e477cafbf1f0fae6714fb962e02f07e':
      Move gralloc from vendor to here

commit f1ff1e8b8e477cafbf1f0fae6714fb962e02f07e
Merge: ec1a65a 2480ecc
Author: Rebecca Schultz Zavin <rebecca@android.com>
Date:   Wed Aug 15 11:54:29 2012 -0700

    am 2480eccc: Move gralloc from vendor to here

    * commit '2480eccc3025c1a888e233e2ffbd3c098395de15':
      Move gralloc from vendor to here

commit 36c98d64c1e11fde27adc6c270690f03b00a81f2
Merge: 9d23db2 ec1a65a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 15 08:32:19 2012 -0700

    am ec1a65ad: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'ec1a65ada55c89dd798b8bdf14d0982528b289d7':

commit ec1a65ada55c89dd798b8bdf14d0982528b289d7
Merge: fa007e9 11c97d6
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 15 08:27:52 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I99ecd3a71950372c747d4a815061d2d37941cc8e

commit 9d23db29d00daebbe98dbf8dad5d14b1d5257add
Merge: 67dfc86 fa007e9
Author: Benoit Goby <benoit@android.com>
Date:   Tue Aug 14 20:27:21 2012 -0700

    am fa007e9b: am d6bb7cef: hwc: read hdmi resolution to properly configure gscaler

    * commit 'fa007e9bac0ac3de11a42b65c96607fdc7f38420':
      hwc: read hdmi resolution to properly configure gscaler

commit fa007e9bac0ac3de11a42b65c96607fdc7f38420
Merge: 2db127e d6bb7ce
Author: Benoit Goby <benoit@android.com>
Date:   Tue Aug 14 20:25:33 2012 -0700

    am d6bb7cef: hwc: read hdmi resolution to properly configure gscaler

    * commit 'd6bb7cef6f2325e7703704b3acbec99df2b6d381':
      hwc: read hdmi resolution to properly configure gscaler

commit 67dfc860fdf8364841617d10d9a67631c9ab79cd
Merge: 4155b68 2db127e
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Aug 14 17:41:25 2012 -0700

    am 2db127ed: am 296668ec: hwc: fix colors on YCrCb surfaces

    * commit '2db127ed0add7c59dce2ae5931870972205d906f':
      hwc: fix colors on YCrCb surfaces

commit 2db127ed0add7c59dce2ae5931870972205d906f
Merge: bf74984 296668e
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Aug 14 17:40:19 2012 -0700

    am 296668ec: hwc: fix colors on YCrCb surfaces

    * commit '296668ec39f8e30a0aa652f6a99ebfd522fda864':
      hwc: fix colors on YCrCb surfaces

commit 4155b68efe2f3cdbb15a3f7406d7d862130479ad
Merge: dc84246 bf74984
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Aug 14 01:21:09 2012 -0700

    am bf749844: am daa1fcd6: hardware: samsung_slsi: libcamera2: Reconstruct static info class

    * commit 'bf7498444c3c59d7358d14b47cf2d422ae52f62c':
      hardware: samsung_slsi: libcamera2: Reconstruct static info class

commit bf7498444c3c59d7358d14b47cf2d422ae52f62c
Merge: 0e9b47c daa1fcd
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Aug 14 01:20:04 2012 -0700

    am daa1fcd6: hardware: samsung_slsi: libcamera2: Reconstruct static info class

    * commit 'daa1fcd6e8861944412e5c77db5eb441512aef38':
      hardware: samsung_slsi: libcamera2: Reconstruct static info class

commit dc84246627dd7f49937e5c3e519728831220d80e
Merge: e619131 0e9b47c
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Aug 13 22:33:08 2012 -0700

    am 0e9b47c2: am 804236a7: hardware: samsung_slsi: libcamera2: Change recording format to NV12M

    * commit '0e9b47c291c74a8488cb27565a4b95978ab3093c':
      hardware: samsung_slsi: libcamera2: Change recording format to NV12M

commit e6191310a695f5f16da88c6bfc765744833fb8be
Merge: 4a98349 14fc330
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Mon Aug 13 22:33:07 2012 -0700

    am 14fc3306: am 33d6044e: exynos_omx: multi_thread: Add New Encode scheme for support input buffer shere.

    * commit '14fc330695d25db709e568384f87c33ccaf1ad8f':
      exynos_omx: multi_thread: Add New Encode scheme for support input buffer shere.

commit 0e9b47c291c74a8488cb27565a4b95978ab3093c
Merge: 14fc330 804236a
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Aug 13 22:31:39 2012 -0700

    am 804236a7: hardware: samsung_slsi: libcamera2: Change recording format to NV12M

    * commit '804236a79511be71fc1ebf16c14aa2021bd0d53f':
      hardware: samsung_slsi: libcamera2: Change recording format to NV12M

commit 14fc330695d25db709e568384f87c33ccaf1ad8f
Merge: 71631e1 33d6044
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Mon Aug 13 22:31:38 2012 -0700

    am 33d6044e: exynos_omx: multi_thread: Add New Encode scheme for support input buffer shere.

    * commit '33d6044e338e2ea5c8580b6a52840808e459d998':
      exynos_omx: multi_thread: Add New Encode scheme for support input buffer shere.

commit 4a98349d275426ed9969a280a3d5e0262fac51e2
Merge: 3c6041c 71631e1
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Fri Aug 10 17:07:56 2012 -0700

    am 71631e17: am 2590f08f: exynos_omx: multi_thread: Change shared memory allocator for DRM play.

    * commit '71631e1706e6c674ab132967279346a36be9b018':
      exynos_omx: multi_thread: Change shared memory allocator for DRM play.

commit 3c6041c52a78cfc8bb42fe1b90e35d1ae6da6040
Merge: b1180ad d4f6542
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Fri Aug 10 17:07:55 2012 -0700

    am d4f65428: am 0e6617d9: exynos_omx: multi_thread: Fix the DRM play bug.

    * commit 'd4f654283e2005ad801eba652fa03028d4840e91':
      exynos_omx: multi_thread: Fix the DRM play bug.

commit 71631e1706e6c674ab132967279346a36be9b018
Merge: d4f6542 2590f08
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Fri Aug 10 17:06:24 2012 -0700

    am 2590f08f: exynos_omx: multi_thread: Change shared memory allocator for DRM play.

    * commit '2590f08f743402db357146c2feed73275440f388':
      exynos_omx: multi_thread: Change shared memory allocator for DRM play.

commit d4f654283e2005ad801eba652fa03028d4840e91
Merge: 75b1149 0e6617d
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Fri Aug 10 17:06:23 2012 -0700

    am 0e6617d9: exynos_omx: multi_thread: Fix the DRM play bug.

    * commit '0e6617d9084f11fe951775e67a2ab8a71e50af94':
      exynos_omx: multi_thread: Fix the DRM play bug.

commit b1180ad74cf224ede28e42c12bc1cb8603fac5ca
Merge: 72e1df5 75b1149
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Fri Aug 10 13:47:22 2012 -0700

    am 75b11496: am b1957044: hardware: samsung_slsi: V4L2 CID update.

    * commit '75b11496ddc11df28013795e56002004d44c6ef0':
      hardware: samsung_slsi: V4L2 CID update.

commit 75b11496ddc11df28013795e56002004d44c6ef0
Merge: 7638182 b195704
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Fri Aug 10 13:45:14 2012 -0700

    am b1957044: hardware: samsung_slsi: V4L2 CID update.

    * commit 'b1957044edf5088a5dbcd4d556ea3de4021313d2':
      hardware: samsung_slsi: V4L2 CID update.

commit 72e1df5b764eecda7402d413cc0935f6a504ac78
Merge: 32be859 7638182
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 10 08:55:36 2012 -0700

    am 76381822: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '76381822755e8d1a0004e2eb860e3837688dbada':

commit 76381822755e8d1a0004e2eb860e3837688dbada
Merge: f7c9db1 6edaed6
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Aug 10 08:53:05 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I0a62a9c9584d21c50e7c2a2f64ba3ff91644c35c

commit 32be859738f49611d8b1326a3c293db0f5486393
Merge: 809c018 f7c9db1
Author: Dima Zavin <dmitriyz@google.com>
Date:   Fri Aug 10 00:09:12 2012 -0700

    am f7c9db16: am 8153ac20: Merge changes I7936d6f4,Ide5a1370 into jb-mr1-dev

    * commit 'f7c9db1637513c5adde10f2aa63ef33359aa69ef':
      exynos5: mobicore: cleanup of makefiles
      manta: add MobiCore userspace daemon and libraries

commit f7c9db1637513c5adde10f2aa63ef33359aa69ef
Merge: adc14c5 8153ac2
Author: Dima Zavin <dmitriyz@google.com>
Date:   Fri Aug 10 00:07:26 2012 -0700

    am 8153ac20: Merge changes I7936d6f4,Ide5a1370 into jb-mr1-dev

    * commit '8153ac20ccdf0f4b8594f95f8e7426dbbcc7a5f3':
      exynos5: mobicore: cleanup of makefiles
      manta: add MobiCore userspace daemon and libraries

commit 809c018917ab90bd0b7711c44d14c8c56c81f26d
Merge: 0b37673 adc14c5
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Thu Aug 9 17:11:43 2012 -0700

    am adc14c52: am dccf6a03: exynos_omx: multi_thread: Change output color format.

    * commit 'adc14c526355ccc99c4a114112739340d60fc268':
      exynos_omx: multi_thread: Change output color format.

commit adc14c526355ccc99c4a114112739340d60fc268
Merge: 9540f0a dccf6a0
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Thu Aug 9 17:10:36 2012 -0700

    am dccf6a03: exynos_omx: multi_thread: Change output color format.

    * commit 'dccf6a03b890fb6ec7202a62ed1aac03c1672132':
      exynos_omx: multi_thread: Change output color format.

commit 0b37673b338d6435ae7fa1c4cb4b38ebd3c9f827
Merge: 7435f27 9540f0a
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Aug 8 11:22:18 2012 -0700

    am 9540f0ae: am b68c0594: Merge "hardware: samsung_slsi: libcamera2: Stability Fix and code clean-up" into jb-mr1-dev

    * commit '9540f0aefdf24bc66304eb085bfc9f72a81302d8':
      hardware: samsung_slsi: libcamera2: Stability Fix and code clean-up

commit 9540f0aefdf24bc66304eb085bfc9f72a81302d8
Merge: 963c5f7 b68c059
Author: Rebecca Zavin <rebecca@android.com>
Date:   Wed Aug 8 11:20:45 2012 -0700

    am b68c0594: Merge "hardware: samsung_slsi: libcamera2: Stability Fix and code clean-up" into jb-mr1-dev

    * commit 'b68c0594d6eea2762ec475418ff2d0d8e6c4aa91':
      hardware: samsung_slsi: libcamera2: Stability Fix and code clean-up

commit 7435f2739bc097d09e0279241faa57417cac6656
Merge: 8794f7d 963c5f7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 08:18:47 2012 -0700

    am 963c5f70: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '963c5f700e40bf462eb0da8328cac5c92b3003df':

commit 963c5f700e40bf462eb0da8328cac5c92b3003df
Merge: d7c4930 9f93e1c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 8 08:17:22 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ib4a954994a6baac577fe02fe9d2101d6af558d26

commit 8794f7d800678b4c1f6c3d1367907188b2373175
Merge: f622626 d7c4930
Author: Jesse Hall <jessehall@google.com>
Date:   Tue Aug 7 13:52:44 2012 -0700

    am d7c49307: am e94046d9: Minimal changes to support multi-display HWC

    * commit 'd7c4930763cdf8d04f9b2fb865d641db114451f1':
      Minimal changes to support multi-display HWC

commit d7c4930763cdf8d04f9b2fb865d641db114451f1
Merge: e5d0f31 e94046d
Author: Jesse Hall <jessehall@google.com>
Date:   Tue Aug 7 13:50:43 2012 -0700

    am e94046d9: Minimal changes to support multi-display HWC

    * commit 'e94046d91136bbb2654ae197dc1782b7f11275d0':
      Minimal changes to support multi-display HWC

commit f622626db5127139e6907182d99f779002cae2c9
Merge: 8ef0777 e5d0f31
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 7 11:05:58 2012 -0700

    am e5d0f31f: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'e5d0f31fc8fbf2542890b5c56e29f3bb9f757bdb':

commit e5d0f31fc8fbf2542890b5c56e29f3bb9f757bdb
Merge: 4c18e59 98102d7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Aug 7 11:04:11 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I2b2420ba4d794538c339859185c9a6be5637343a

commit 8ef0777af8d46f47d16141cd2bb1189d13f784f7
Merge: 984c78f 4c18e59
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 7 10:46:51 2012 -0700

    am 4c18e59e: am 5f18f784: exynos5: libgscaler: modify set_format function.

    * commit '4c18e59ec7aab36293e07c465f7f389fe600d7ea':
      exynos5: libgscaler: modify set_format function.

commit 4c18e59ec7aab36293e07c465f7f389fe600d7ea
Merge: 49fec87 5f18f78
Author: Sanghee Kim <haya93@samsung.com>
Date:   Tue Aug 7 10:45:18 2012 -0700

    am 5f18f784: exynos5: libgscaler: modify set_format function.

    * commit '5f18f78469508e24debe7c804094f963f99f4d20':
      exynos5: libgscaler: modify set_format function.

commit 984c78f596af356d211719e2385ff368fb0ef18f
Merge: 5f2cc45 49fec87
Author: Dima Zavin <dima@android.com>
Date:   Mon Aug 6 16:14:51 2012 -0700

    am 49fec879: am 304a1f91: Merge "HACK: exynos5: gscaler: do not skip s_fmt/reqbufs on gsc_convert path" into jb-mr1-dev

    * commit '49fec8796b3c991ab07065ea3639b55bf6b14755':
      HACK: exynos5: gscaler: do not skip s_fmt/reqbufs on gsc_convert path

commit 49fec8796b3c991ab07065ea3639b55bf6b14755
Merge: fa4db9b 304a1f9
Author: Dima Zavin <dima@android.com>
Date:   Mon Aug 6 16:14:00 2012 -0700

    am 304a1f91: Merge "HACK: exynos5: gscaler: do not skip s_fmt/reqbufs on gsc_convert path" into jb-mr1-dev

    * commit '304a1f91d0abd919994d3b2dc2d66060c36e109f':
      HACK: exynos5: gscaler: do not skip s_fmt/reqbufs on gsc_convert path

commit 5f2cc45c0dcb272056e6dbf5d6ae88541d076335
Merge: 3043e7e fa4db9b
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Aug 6 13:26:57 2012 -0700

    am fa4db9bc: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'fa4db9bcb394b4d77c55e716f7f0001b9fa74cbd':

commit fa4db9bcb394b4d77c55e716f7f0001b9fa74cbd
Merge: 47434d9 87420ef
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Aug 6 13:24:25 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: I4c7bacedfff6537350fdb1a72b2ef4397ce21bab

commit 3043e7e3efc88db6ed19c07d5726c2b2ab2c7eb7
Merge: fe8dbfe 47434d9
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 6 12:08:41 2012 -0700

    am 47434d99: am 227ae8ae: hwc: enforce gscaler limitations on scaling factor

    * commit '47434d99f1dfb680d68a2c62f065cac65ac04de3':
      hwc: enforce gscaler limitations on scaling factor

commit 47434d99f1dfb680d68a2c62f065cac65ac04de3
Merge: b989a6f 227ae8a
Author: Greg Hackmann <ghackmann@google.com>
Date:   Mon Aug 6 12:07:00 2012 -0700

    am 227ae8ae: hwc: enforce gscaler limitations on scaling factor

    * commit '227ae8aef6c88f5321dad4aeed230c43a39594ca':
      hwc: enforce gscaler limitations on scaling factor

commit fe8dbfeead1743c7cb91eefaa7423432863ab7f5
Merge: 2035aa7 b989a6f
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Fri Aug 3 15:06:18 2012 -0700

    am b989a6f3: am f45c4a0e: exynos_omx: multi_thread: The case of "enable native buffer", Change the conditions of checking.

    * commit 'b989a6f36e51c29e8c7406f2b68b04ef65efe443':
      exynos_omx: multi_thread: The case of "enable native buffer", Change the conditions of checking.

commit b989a6f36e51c29e8c7406f2b68b04ef65efe443
Merge: f5c52e0 f45c4a0
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Fri Aug 3 14:58:02 2012 -0700

    am f45c4a0e: exynos_omx: multi_thread: The case of "enable native buffer", Change the conditions of checking.

    * commit 'f45c4a0e4e5679e723ffb6fd92c4a6929b62b5b1':
      exynos_omx: multi_thread: The case of "enable native buffer", Change the conditions of checking.

commit 2035aa7edee671e05836a35ccc4bd99f65ecc3ee
Merge: ad9dbaa f5c52e0
Author: James Dong <jdong@google.com>
Date:   Fri Aug 3 14:38:41 2012 -0700

    am f5c52e05: am b8d6caa5: Remove excessive logging

    * commit 'f5c52e0561b73d9e55ce431495b4eceb18140ae2':
      Remove excessive logging

commit f5c52e0561b73d9e55ce431495b4eceb18140ae2
Merge: a18ed9a b8d6caa
Author: James Dong <jdong@google.com>
Date:   Fri Aug 3 14:35:54 2012 -0700

    am b8d6caa5: Remove excessive logging

    * commit 'b8d6caa56f49db9de297a80004571c6830cef90a':
      Remove excessive logging

commit ad9dbaae58936e44aa212be16b8dda9f9bf27d10
Merge: 79d3657 a18ed9a
Author: Dima Zavin <dima@android.com>
Date:   Thu Aug 2 16:36:21 2012 -0700

    am a18ed9a8: am 24eadba9: exynos5: metadata buffer contains a buffer handle, not anativewindow

    * commit 'a18ed9a8ee1368e1aebe658c052aacb492eb5ea3':
      exynos5: metadata buffer contains a buffer handle, not anativewindow

commit a18ed9a8ee1368e1aebe658c052aacb492eb5ea3
Merge: de2dda7 24eadba
Author: Dima Zavin <dima@android.com>
Date:   Thu Aug 2 16:34:08 2012 -0700

    am 24eadba9: exynos5: metadata buffer contains a buffer handle, not anativewindow

    * commit '24eadba90486f04d1755de644e21b4eaeb7afe3e':
      exynos5: metadata buffer contains a buffer handle, not anativewindow

commit 79d365715819434d23f5e7e1763e5786142fa8a7
Merge: ee2ee5a de2dda7
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 2 15:09:00 2012 -0700

    am de2dda78: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit 'de2dda782fad184b36a1ffc9567a95cd096ea5b5':

commit de2dda782fad184b36a1ffc9567a95cd096ea5b5
Merge: 4f7b449 19c502d
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Aug 2 11:26:48 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Ibe115fb4a81b09680111c50ed0a638320411ead6

commit ee2ee5aa74d08caf0133c306ea7814b529f2b25d
Merge: 29c932c 4f7b449
Author: Yongbae Song <yb.song@samsung.com>
Date:   Wed Aug 1 17:24:34 2012 -0700

    am 4f7b4492: am 2607aa30: exynos5: libgscaler: Add NV12 colorFormat

    * commit '4f7b4492a5c1862bfbc7c0a3e2e616f75bbe8df7':
      exynos5: libgscaler: Add NV12 colorFormat

commit 29c932cc15ba1155fe81c5f588364124452bd0b6
Merge: f94a552 60daf01
Author: Yongbae Song <yb.song@samsung.com>
Date:   Wed Aug 1 17:24:33 2012 -0700

    am 60daf011: am 4006f615: exynos5: libgscaler: added the V4L2_PIX_FMT for YUV420P

    * commit '60daf01163d33c1f04b781ca0554256b91ba9093':
      exynos5: libgscaler: added the V4L2_PIX_FMT for YUV420P

commit 4f7b4492a5c1862bfbc7c0a3e2e616f75bbe8df7
Merge: 60daf01 2607aa3
Author: Yongbae Song <yb.song@samsung.com>
Date:   Wed Aug 1 16:07:59 2012 -0700

    am 2607aa30: exynos5: libgscaler: Add NV12 colorFormat

    * commit '2607aa30bcae2244e1bc68cbc0a0fc5a2b4ef570':
      exynos5: libgscaler: Add NV12 colorFormat

commit 60daf01163d33c1f04b781ca0554256b91ba9093
Merge: 53dcdbd 4006f61
Author: Yongbae Song <yb.song@samsung.com>
Date:   Wed Aug 1 16:07:58 2012 -0700

    am 4006f615: exynos5: libgscaler: added the V4L2_PIX_FMT for YUV420P

    * commit '4006f615bd7b5ad1f11120ad3172b5b4981e37b9':
      exynos5: libgscaler: added the V4L2_PIX_FMT for YUV420P

commit f94a552d12c4eb2bc21e98e0cf562ce13e1bd235
Merge: 7c1b119 53dcdbd
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Wed Aug 1 11:53:38 2012 -0700

    am 53dcdbdc: am 1245032e: exynos_omx: multi_thread: Fix H.263 encoder.

    * commit '53dcdbdc332ad08e55d517f045c36741e0869460':
      exynos_omx: multi_thread: Fix H.263 encoder.

commit 53dcdbdc332ad08e55d517f045c36741e0869460
Merge: 3288253 1245032
Author: SeungBeom Kim <sbcrux.kim@samsung.com>
Date:   Wed Aug 1 11:46:19 2012 -0700

    am 1245032e: exynos_omx: multi_thread: Fix H.263 encoder.

    * commit '1245032e056f079c67b942176d70c5c86b427f62':
      exynos_omx: multi_thread: Fix H.263 encoder.

commit 7c1b11950fc8b09d0e17d8454fa5ddeb0c0bfa9b
Merge: d10be46 3288253
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Aug 1 09:01:17 2012 -0700

    am 32882536: am a00c0435: hwc: set gscaler output to BGR32

    * commit '32882536159091da86e70a5df055e093c9e21527':
      hwc: set gscaler output to BGR32

commit 32882536159091da86e70a5df055e093c9e21527
Merge: 68c588a a00c043
Author: Greg Hackmann <ghackmann@google.com>
Date:   Wed Aug 1 08:58:58 2012 -0700

    am a00c0435: hwc: set gscaler output to BGR32

    * commit 'a00c043512babb1d6f48a0a505f30b906fac8066':
      hwc: set gscaler output to BGR32

commit d10be460b2e78cc611df51090b138a0431f7148e
Merge: a386c46 68c588a
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:06:00 2012 -0700

    am 68c588ab: (-s ours) Reconcile with jb-mr1-release - do not merge

    * commit '68c588abeb70750e68116621c23dfc7a1f9b75bc':
      Revert "Minimal changes to support multi-display HWC"
      HACK: hwc: reserve gscaler 2 for camera

commit 68c588abeb70750e68116621c23dfc7a1f9b75bc
Merge: d71898f 3185f27
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 15:03:30 2012 -0700

    Reconcile with jb-mr1-release - do not merge

    Change-Id: Iafa34e47ae2ee2399341dbac7f91ef1d5f9fa066

commit a386c4647c2e6da6776516d9dd0d5baeef4b49e3
Merge: 2755055 d71898f
Author: Jesse Hall <jessehall@google.com>
Date:   Tue Jul 31 12:28:51 2012 -0700

    am d71898f8: am b6e1fa0e: Revert "Minimal changes to support multi-display HWC"

    * commit 'd71898f8dc3e2c41e74b571dfc0129c03d165c70':
      Revert "Minimal changes to support multi-display HWC"

commit d71898f8dc3e2c41e74b571dfc0129c03d165c70
Merge: 8de1f20 b6e1fa0
Author: Jesse Hall <jessehall@google.com>
Date:   Tue Jul 31 12:27:08 2012 -0700

    am b6e1fa0e: Revert "Minimal changes to support multi-display HWC"

    * commit 'b6e1fa0e07a63d8ec27f5dd197d2ecdee1326b76':
      Revert "Minimal changes to support multi-display HWC"

commit 2755055180dfdec9633e99810e160478e0aabe3f
Merge: e42f3a2 8de1f20
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Jul 31 11:16:35 2012 -0700

    am 8de1f201: am 49e5108e: HACK: hwc: reserve gscaler 2 for camera

    * commit '8de1f201470ea6af33570925728c13b46f15a42e':
      HACK: hwc: reserve gscaler 2 for camera

commit 8de1f201470ea6af33570925728c13b46f15a42e
Merge: f1263d8 49e5108
Author: Greg Hackmann <ghackmann@google.com>
Date:   Tue Jul 31 11:14:49 2012 -0700

    am 49e5108e: HACK: hwc: reserve gscaler 2 for camera

    * commit '49e5108eb6444e15edb323b957af9ae36c3e03b5':
      HACK: hwc: reserve gscaler 2 for camera

commit e42f3a22b738308d30c9a0a694806c89650762f8
Merge: 8f45baa f1263d8
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 07:54:38 2012 -0700

    am f1263d8d: Sync with jb-mr1-dev

    * commit 'f1263d8d3ccf8b36b47cec65cc5612d46d0cd483':
      Minimal changes to support multi-display HWC
      hwc: enable gscaler memory-to-memory
      libgscaler: fix set_dst_addr() return value
      exynos5: libgscaler: GSC m2m non-blocking feature is added

commit f1263d8d3ccf8b36b47cec65cc5612d46d0cd483
Merge: 386436c 57e4cb5
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Jul 31 07:52:08 2012 -0700

    Sync with jb-mr1-dev

    Change-Id: I7a4f4b3a77d16e1171b9a0e8c9b7923619dbeca0

commit 8f45baa1e2184e433e222f884d609b5f0b5ce7dc
Merge: 0a52aa7 386436c
Author: Alex Ray <aray@google.com>
Date:   Mon Jul 30 22:31:37 2012 -0700

    am 386436c9: hardware: samsung_slsi: libcamera2: verbose log messages (again)

    * commit '386436c9d726acffc5335000c6e3475c6eac2b29':
      hardware: samsung_slsi: libcamera2: verbose log messages (again)

commit 0a52aa7bdb4c128c9fcef93a0262dac8e4eac139
Merge: 4704e6f 3f0357b
Author: Alex Ray <aray@google.com>
Date:   Mon Jul 30 22:31:36 2012 -0700

    am 3f0357b8: hardware: samsung_slsi: libcamera2: verbose log messages

    * commit '3f0357b8279fa01ed0692f531f7777df4c836bc0':
      hardware: samsung_slsi: libcamera2: verbose log messages

commit 4704e6ff61f387703c792766be7ff55450a74d21
Merge: 88e3e25 6bbb593
Author: Alex Ray <aray@google.com>
Date:   Mon Jul 30 15:05:58 2012 -0700

    am 6bbb593a: hardware: samsung_slsi: libcamera2: update DMABUF references

    * commit '6bbb593a5c3cded974340d5be9273cb551962b40':
      hardware: samsung_slsi: libcamera2: update DMABUF references

commit 88e3e2575b7b552de92e90d0695e7b2bd7ddf388
Merge: bea9420 db65ac7
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Jul 30 15:05:57 2012 -0700

    am db65ac7f: hardware: samsung_slsi: libhwjpeg: support DMABUF

    * commit 'db65ac7fe2997ec27e06b1fc76c18a3d174534bc':
      hardware: samsung_slsi: libhwjpeg: support DMABUF

commit bea9420c5acf8a87b2122c9bc7463561a67bfe7b
Merge: b019673 7bcca34
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Jul 30 15:05:56 2012 -0700

    am 7bcca344: hardware: samsung_slsi: include: update header file for JPEG

    * commit '7bcca344f435c3cdb9ab3375323bc6fac93bbfe0':
      hardware: samsung_slsi: include: update header file for JPEG

commit b019673ed731dc259e74f59bccdf94078e779f05
Merge: 3f0de11 a07cbd9
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Jul 30 15:05:53 2012 -0700

    am a07cbd98: hardware: samsung_slsi: libcamera2: Fixed Front Camera Recording

    * commit 'a07cbd98ba13f790f2e78cebc68bebde83de0518':
      hardware: samsung_slsi: libcamera2: Fixed Front Camera Recording

commit 3f0de1133a941c9287291f1644965c51d167c630
Merge: 1ae3b55 b5237e6
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Jul 30 15:05:52 2012 -0700

    am b5237e6b: (-s ours) hardware: samsung_slsi: libcamera2: Bug fixes and code cleanup

    * commit 'b5237e6bdb2c87f61ccf5b22cdb922691095fc2f':
      hardware: samsung_slsi: libcamera2: Bug fixes and code cleanup

commit 1ae3b55905e826e9487d831cd3f57beaec1e5cfc
Merge: e149182 9dd63e1
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Jul 30 15:04:18 2012 -0700

    am 9dd63e1f: (-s ours) hardware: samsung_slsi: libcamera2: support front camera

    * commit '9dd63e1fc352306d6680c517b7ce9936683c78c4':
      hardware: samsung_slsi: libcamera2: support front camera

commit e1491825e24d29897cdd7bc54f16be9d7dbb50b4
Merge: 67f55ae 66e9199
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Jul 30 15:01:40 2012 -0700

    am 66e91991: hardware: samsung_slsi: libgscaler: Added support for NV21M

    * commit '66e91991f45bf7c56f4993a2c5c2356421017368':
      hardware: samsung_slsi: libgscaler: Added support for NV21M

commit 67f55ae01dd212fa251a572ad6a813d7911a2728
Merge: 937f0ac 23dac69
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Jul 30 15:01:39 2012 -0700

    am 23dac69c: (-s ours) hardware: samsung_slsi: libgscaler: bug fix for NV16

    * commit '23dac69caf127d309df8157099f7a8a21102c830':
      hardware: samsung_slsi: libgscaler: bug fix for NV16

commit 937f0ac7ded82a9e0356d47409e8df67fa485d15
Merge: 169af97 13d8c7b
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Mon Jul 30 15:00:05 2012 -0700

    am 13d8c7b4: (-s ours) hardware: samsung_slsi: libcamera2: Camera 2.0 2nd release

    * commit '13d8c7b4650fb7897b4291ed9b3d57b19f7d1ccd':
      hardware: samsung_slsi: libcamera2: Camera 2.0 2nd release

commit 169af973a0c9d4d25d02826ea52a67e619dd8223
Author: Alex Ray <aray@google.com>
Date:   Fri Jul 27 17:19:48 2012 -0700

    hardware: samsung_slsi: libcamera2: update DMABUF references

    Change-Id: Id6f2a9aa4e91c766bc3047a3946c365723dc4224
    Signed-off-by: Alex Ray <aray@google.com>

commit ed904e28cf0b698147bc57035d3def08c32fcd60
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Jul 20 22:31:51 2012 +0900

    hardware: samsung_slsi: libhwjpeg: support DMABUF

    Change-Id: I4ca119dbc9c83a2c334b095cf305fc8df72e0207
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

commit 6effbc40b1dedbfbdc8cc5e0226b0b36cd899794
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Jul 20 22:30:40 2012 +0900

    hardware: samsung_slsi: include: update header file for JPEG

    To support DMABUF, update jpeg header file

    Change-Id: Ib3b3fd3a1f8142c85a8ebf7217ab3cb6a17a8e56
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

commit be1fb532126116d3f71657960b9541c2b4496bbf
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Jul 27 12:03:29 2012 -0700

    hardware: samsung_slsi: libcamera2: Fixed Front Camera Recording

    This patch fixes lockup during front camera recording.

    Change-Id: I8f308a763feabc414154bb9d372e559605275244
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

commit 47a707ff24ef691afea5c8e8f457197a03221871
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Jul 27 07:39:05 2012 -0700

    hardware: samsung_slsi: libcamera2: Bug fixes and code cleanup

    This patch resolves instability of last version.
    With this patch and latest kernel patches,
    failure on re-entering camera app has also been resolved.

    Change-Id: I2acf3c659256798280c41869b9d84d72846f34af
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

commit 4619016307b12a8fe204459be462c59164c729b9
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Tue Jul 24 00:25:51 2012 +0900

    hardware: samsung_slsi: libcamera2: support front camera

    This version also supports Video Recording.
    Fixed file permission and front camera recording failure.

    Change-Id: Ibad9f007107576ff25e3d189d4f3e96435b989c1
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

commit 52e634803351bde8794fc7f6f6554e5cfc4a295e
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Wed Jul 25 19:04:19 2012 -0700

    hardware: samsung_slsi: libgscaler: Added support for NV21M

    Added support for NV21M which means HAL_PIXEL_FORMAT_YCrCb_420_SP

    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

    Change-Id: Ibfdd3ba5781d2ad7eff6e6c1e2c0a61351de40fc

commit 19973ed76c1f43a51cab81b99b344c3095f125a1
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Fri Jul 20 22:33:13 2012 +0900

    hardware: samsung_slsi: libgscaler: bug fix for NV16

    change plane count from 2 to 1 for NV16 format

    Change-Id: Id8789ddb007c03cbf04c3a26e2094f4a15e0bbcc
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

commit dda1e8f815a458a28fd3939177a004ad0fac0291
Author: Sungjoong Kang <sj3.kang@samsung.com>
Date:   Sat Jul 14 10:20:39 2012 +0900

    hardware: samsung_slsi: libcamera2: Camera 2.0 2nd release

    This version includes HAL implementation for supporting stillshot.
    This version requires dma_buf enabled gscaler and jpeg encodere.
    Fixed Color Inversion.

    Change-Id: Id4386733d1f3e87ac6fa9b15bb3ed93b2f5f25a5
    Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

Change-Id: I17b917b8f56f0e2ee3fdecf1496fbfe66f1f4d3e