Squashed commit of the following:

commit 2bfd180d5257d72f7c22c80741e6b03470f3aa60
Author: Alex Ray <aray@google.com>
Date:   Mon Apr 22 18:16:11 2013 -0700

    camera: Handle capture request in AF run

    Bug: 8140969
    Change-Id: I1e1889434d57714cdb0c10929609eade299c1ea9

commit ee52126edf8ff361cc2aff193488302985e4df1b
Author: Ying Wang <wangying@google.com>
Date:   Tue Apr 9 22:01:26 2013 -0700

    Add liblog

    Bug: 8580410
    Change-Id: If897b4d39c67a49aa590b1692d26db794a53c2a3

commit 0c7098837630e258e0e6cbc8a54e977410fd2b6c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Thu Mar 28 14:42:38 2013 -0700

    cleanup

    Change-Id: Id710a5b742eb81351f0ef14a331824293b4df522

commit 58134d029dce1f2e0d15b0717491697ed693d150
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Fri Mar 22 09:45:43 2013 -0700

    Fix native test's calls to camera library

    Change-Id: I816bd24669229c3ff3a8397c516080c7d409455f

commit 50f28e594dc1ae97a8d63d141994e38af52cd20f
Author: Mathias Agopian <mathias@google.com>
Date:   Tue Mar 12 18:50:57 2013 -0700

    remove Surface uses in favor of IGraphicBufferProducer

    Change-Id: I0d52884fbe80aa7f29f71bfbedd62162601a1360

commit 9f5f49764ba7b37b020e89881e27bfb7ee545356
Merge: 64c6d6d 32f08e7
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Dec 3 18:25:48 2012 -0800

    am 32f08e77: Merge "Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not set"

    * commit '32f08e77913e7938f5982276a3c44d93d8091498':
      Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not set

commit 32f08e77913e7938f5982276a3c44d93d8091498
Merge: 015960e 646975c
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Dec 3 18:17:14 2012 -0800

    Merge "Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not set"

commit 646975c9e41ec806ac6547b123dbaaf89859f1d4
Author: Dan Murphy <dmurphy@ti.com>
Date:   Tue Nov 27 13:37:33 2012 -0600

    Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not set

    Since the panda uses HDMI and DVI only there is no setting to
    indicate the x/y res or dimensions.

    There fore if these values are not set in the kernel set the
    lcd_xpy to 1

    Change-Id: I538eb0fc059daebfa3fe125cbdf0b70eb51f1616
    Signed-off-by: Dan Murphy <dmurphy@ti.com>

commit 64c6d6dddfe9b1a0fdd5b501ed343c82c345b7eb
Merge: a076348 015960e
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Thu Nov 8 15:58:57 2012 -0800

    am 015960eb: am 707e301d: Revert "CameraHal: Sync AF cancel with incoming OMX events"

    * commit '015960eb1f62f682432137441737d8440a871536':
      Revert "CameraHal: Sync AF cancel with incoming OMX events"

commit 015960eb1f62f682432137441737d8440a871536
Merge: 646723c 707e301
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Thu Nov 8 12:02:57 2012 -0800

    am 707e301d: Revert "CameraHal: Sync AF cancel with incoming OMX events"

    * commit '707e301de8b52780a7f0e88e6f25ac919c23671f':
      Revert "CameraHal: Sync AF cancel with incoming OMX events"

commit a0763482ea8c9cb1bf48e9c5f103858bf1e49e4e
Merge: 29bbc4a 646723c
Author: Emilian Peev <epeev@mm-sol.com>
Date:   Mon Nov 5 16:19:35 2012 -0800

    am 646723c0: am b96dffd4: CameraHal: Sync AF cancel with incoming OMX events

    * commit '646723c06120cc9344463f6b3f001178e606838f':
      CameraHal: Sync AF cancel with incoming OMX events

commit 646723c06120cc9344463f6b3f001178e606838f
Merge: 6438f90 b96dffd
Author: Emilian Peev <epeev@mm-sol.com>
Date:   Mon Nov 5 16:15:34 2012 -0800

    am b96dffd4: CameraHal: Sync AF cancel with incoming OMX events

    * commit 'b96dffd40e25d29a61f9fbd7f2e5968b5335b957':
      CameraHal: Sync AF cancel with incoming OMX events

commit 29bbc4a6bc001c3255931dded77a5112c5496874
Author: Glenn Kasten <gkasten@google.com>
Date:   Tue Oct 30 10:59:21 2012 -0700

    Remove obsolete references to libmedia_native

    Bug: 6654403
    Change-Id: I56fbf4925d64670c9d0ce7c8ba78ab6462abee2d

commit 251478690d5402c62a3cbb7d25e040d826d6cb44
Author: Mike Lockwood <lockwood@google.com>
Date:   Wed Oct 24 14:20:17 2012 -0700

    Add embedded omap4 target

    Change-Id: I901fb32c51d05ccc6dbff8f4de17364efac12da3
    Signed-off-by: Mike Lockwood <lockwood@google.com>

commit 6438f90cb8c3702cbd5a742c2535bcffb25e99bc
Merge: b6a9d10 48f7b61
Author: Mike J. Chen <mjchen@google.com>
Date:   Tue Oct 16 17:33:23 2012 -0700

    Merge "Add conditional on TARGET_BOARD_PLATFORM_VARIANT" into jb-mr1-aah-dev

commit 48f7b61596c4d4159141f397a595c76c69da6b9c
Author: Mike J. Chen <mjchen@google.com>
Date:   Mon Oct 15 12:54:09 2012 -0700

    Add conditional on TARGET_BOARD_PLATFORM_VARIANT

    Only build if TARGET_BOARD_PLATFORM_VARIANT is not set.
    Boards (like phantasm) will set TARGET_BOARD_PLATFORM_VARIANT
    when they want to use a different set of hardware files
    (like hardware/ti/omap4-aah) and not the ones in this project.

    Change-Id: I2cd921a97ae66b08494c65e038022fa3c739de72
    Signed-off-by: Mike J. Chen <mjchen@google.com>

Change-Id: Ica6c520cf316570dc846507683e221cfcd86e078