git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

Mangesh Ghiware [Wed, 14 Aug 2013 17:53:45 +0000 (10:53 -0700)]

am 448552fc: am 9c370716: am 2d16b225: Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad

* commit '448552fc961839a0ee6ef779f69abe613a9af087':
Add a trampoline activity to launch new Camera

commit | commitdiff | tree

Mangesh Ghiware [Wed, 14 Aug 2013 17:42:44 +0000 (10:42 -0700)]

am 9c370716: am 2d16b225: Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad

* commit '9c370716eabed079c471b90f3c4e4383854156da':
Add a trampoline activity to launch new Camera

commit | commitdiff | tree

Mangesh Ghiware [Wed, 14 Aug 2013 17:37:41 +0000 (10:37 -0700)]

am 2d16b225: Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad

* commit '2d16b22570ae4ad9c2dc4c3230cc9894eb5bf1a2':
Add a trampoline activity to launch new Camera

commit | commitdiff | tree

Mangesh Ghiware [Wed, 14 Aug 2013 17:34:31 +0000 (17:34 +0000)]

Merge "Add a trampoline activity to launch new Camera" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 17:24:28 +0000 (10:24 -0700)]

am 8916111a: am 6d999bed: am 99c1eeb3: Merge "fix tablet ui" into gb-ub-photos-carlsbad

* commit '8916111ab463c60fcba56b4778233a1abdc9514e':
fix tablet ui

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 17:21:57 +0000 (10:21 -0700)]

am 6d999bed: am 99c1eeb3: Merge "fix tablet ui" into gb-ub-photos-carlsbad

* commit '6d999bedeba820b7d200cc2f285380b5a7ee1a98':
fix tablet ui

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 17:20:26 +0000 (10:20 -0700)]

am 99c1eeb3: Merge "fix tablet ui" into gb-ub-photos-carlsbad

* commit '99c1eeb3929c4faa15e3347a83ce9c4ae6551f0b':
fix tablet ui

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 17:20:05 +0000 (10:20 -0700)]

am 9aa3be2a: am 455b4d7c: am a27067c7: Update strings resources for export dialog

* commit '9aa3be2ae63a4d99858df09855aeff1b11a21424':
Update strings resources for export dialog

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 17:18:39 +0000 (10:18 -0700)]

am 455b4d7c: am a27067c7: Update strings resources for export dialog

* commit '455b4d7c47b4cfb5034596005660d213885d8c44':
Update strings resources for export dialog

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 17:17:25 +0000 (17:17 +0000)]

Merge "fix tablet ui" into gb-ub-photos-carlsbad

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 17:17:15 +0000 (10:17 -0700)]

am a27067c7: Update strings resources for export dialog

* commit 'a27067c7ec4e08805f7cc1936ae7f5783724dfad':
Update strings resources for export dialog

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 17:15:47 +0000 (10:15 -0700)]

am 49223dc1: am 6a9b8b2c: am 0a24e521: Clean up user preset dialog

* commit '49223dc16cfeedcbed8b3574c4fb10f3f1cf110d':
Clean up user preset dialog

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 16:16:15 +0000 (09:16 -0700)]

fix tablet ui

Change-Id: I38aba41e92fdd555391b8ae3ebd65b473bd48366

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 17:13:09 +0000 (10:13 -0700)]

Update strings resources for export dialog

Change-Id: Ia1ebe11ba37c7acc7f900eab4a9552ee495c8c7c

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 17:12:14 +0000 (10:12 -0700)]

am 6a9b8b2c: am 0a24e521: Clean up user preset dialog

* commit '6a9b8b2c6ac3c94c5cc9c39251e9b22c57b9b629':
Clean up user preset dialog

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 17:08:07 +0000 (10:08 -0700)]

am 0a24e521: Clean up user preset dialog

* commit '0a24e52185c4e88dd52b8e072cf7cd1d04f74b0a':
Clean up user preset dialog

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 17:04:37 +0000 (10:04 -0700)]

Clean up user preset dialog

Change-Id: Idefafe3a877e8a0cf25ca955f689818e193fde72

commit | commitdiff | tree

Mangesh Ghiware [Wed, 14 Aug 2013 15:44:07 +0000 (08:44 -0700)]

Add a trampoline activity to launch new Camera

This preserves shortcuts, if any, to the Camera activity in the old
package name.

Bug: 10312966
Change-Id: Iffd3d708333515bb3b998faecff360bc01c142d2

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 16:20:55 +0000 (09:20 -0700)]

am dc31fa13: am 59d0ef1e: am 2e1bc2e3: Fix UI Tablet for saturation panel

* commit 'dc31fa1390a18192287d9a5998c894386b05d997':
Fix UI Tablet for saturation panel

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 16:19:19 +0000 (09:19 -0700)]

am 59d0ef1e: am 2e1bc2e3: Fix UI Tablet for saturation panel

* commit '59d0ef1e099984fbf3a970f1587896c004c299f0':
Fix UI Tablet for saturation panel

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 16:17:37 +0000 (09:17 -0700)]

am 2e1bc2e3: Fix UI Tablet for saturation panel

* commit '2e1bc2e37f285bfaf302a0533a372d4373474d9c':
Fix UI Tablet for saturation panel

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 16:02:59 +0000 (09:02 -0700)]

Fix UI Tablet for saturation panel

Change-Id: Id2fffcefc8af3cf8f6ffe2c84447c3f54070f160

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 15:15:14 +0000 (08:15 -0700)]

am 4ef12487: am e900ebaf: am 55a0279e: Fix for user presets remove menu item add spacer

* commit '4ef12487669853d03f1c2f9cebd985d3f424d03a':
Fix for user presets remove menu item add spacer

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 15:15:08 +0000 (08:15 -0700)]

am 39d97be0: am 2f96b88b: am 665e2582: Merge "add solid round mode to draw" into gb-ub-photos-carlsbad

* commit '39d97be0f297256aff6c11e5b6de184153dd919d':
add solid round mode to draw

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 02:49:42 +0000 (19:49 -0700)]

am e900ebaf: am 55a0279e: Fix for user presets remove menu item add spacer

* commit 'e900ebaff73e80b12aa2ed02db98c7585726fd6f':
Fix for user presets remove menu item add spacer

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 02:47:09 +0000 (19:47 -0700)]

am 55a0279e: Fix for user presets remove menu item add spacer

* commit '55a0279ee420c649606edd7815403d3ca1820c07':
Fix for user presets remove menu item add spacer

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 00:36:00 +0000 (17:36 -0700)]

Fix for user presets
remove menu item
add spacer

Change-Id: I8a83aed6da00c6692f2204fefd17dfff3a599b8d

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 02:27:54 +0000 (19:27 -0700)]

am 2f96b88b: am 665e2582: Merge "add solid round mode to draw" into gb-ub-photos-carlsbad

* commit '2f96b88b59216be04ec297798415b5850ab179e5':
add solid round mode to draw

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 02:24:51 +0000 (19:24 -0700)]

am 665e2582: Merge "add solid round mode to draw" into gb-ub-photos-carlsbad

* commit '665e258238b1e1e0a821530416f2f709e61cb155':
add solid round mode to draw

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 02:22:24 +0000 (02:22 +0000)]

Merge "add solid round mode to draw" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Wed, 14 Aug 2013 02:06:35 +0000 (19:06 -0700)]

add solid round mode to draw

Change-Id: I60249711602fa3aaf2bce0b5035e75f746caa5eb

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 00:57:39 +0000 (17:57 -0700)]

am ab56fe17: am 59afb28f: am fd55ffec: Fix for translation strings

* commit 'ab56fe1721e292228096dc75c252497e61105463':
Fix for translation strings

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 00:54:21 +0000 (17:54 -0700)]

am 59afb28f: am fd55ffec: Fix for translation strings

* commit '59afb28fece7333ba61bbf1738a70657f3884ef1':
Fix for translation strings

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 00:50:25 +0000 (17:50 -0700)]

am fd55ffec: Fix for translation strings

* commit 'fd55ffec5dbec1d37e4e8b32240bd51c7e85275b':
Fix for translation strings

commit | commitdiff | tree

nicolasroard [Wed, 14 Aug 2013 00:36:00 +0000 (17:36 -0700)]

Fix for translation strings

Change-Id: I2c89a377a8a439dd7b77d09a1362c4d6e68752df

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 23:53:10 +0000 (16:53 -0700)]

am 66fe6472: am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

* commit '66fe647204c5bd1a4d4720fad3af89b881e9ac51':
Fix tablet UI layout

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 23:49:40 +0000 (16:49 -0700)]

am 627164c5: am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

* commit '627164c5d02c33c8a4224d34d0cabcd5c19951a0':
Fix tablet UI layout

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 23:49:37 +0000 (16:49 -0700)]

am 657f0a82: am 68b65c98: am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad

* commit '657f0a82ba3583a408d5be03785982b224932507':
fix draw size and style display

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 23:47:59 +0000 (16:47 -0700)]

am 9977d45f: Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

* commit '9977d45fcae932581c1788cf3fa96a3f4040a8dc':
Fix tablet UI layout

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 23:46:07 +0000 (16:46 -0700)]

am 68b65c98: am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad

* commit '68b65c983e31b7a9923abb2eed5e8d736ddf7425':
fix draw size and style display

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 23:45:17 +0000 (23:45 +0000)]

Merge "Fix tablet UI layout" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 23:40:51 +0000 (16:40 -0700)]

am dbc7f587: Merge "fix draw size and style display" into gb-ub-photos-carlsbad

* commit 'dbc7f5878da3038fbe96609ad21b5324e9645367':
fix draw size and style display

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 23:38:08 +0000 (23:38 +0000)]

Merge "fix draw size and style display" into gb-ub-photos-carlsbad

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 23:29:11 +0000 (16:29 -0700)]

Fix tablet UI layout

Change-Id: I19a6f6751dd7754e8b0de6eb22a82041b1dff29f

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 21:00:58 +0000 (14:00 -0700)]

fix draw size and style display

Change-Id: Ia7419e0f03e48fd099b678aa81c351462ee6937a

commit | commitdiff | tree

Doris Liu [Tue, 13 Aug 2013 21:09:53 +0000 (14:09 -0700)]

am 69b22f7e: am 0581bac4: am 389e8c88: Remove old video camera icon and label from Gallery

* commit '69b22f7eda0db8354109a96d1bdfd349e3e35a18':
Remove old video camera icon and label from Gallery

commit | commitdiff | tree

Doris Liu [Tue, 13 Aug 2013 21:03:13 +0000 (14:03 -0700)]

am 0581bac4: am 389e8c88: Remove old video camera icon and label from Gallery

* commit '0581bac494204a2dd5f246872d14691d562faa4b':
Remove old video camera icon and label from Gallery

commit | commitdiff | tree

Doris Liu [Tue, 13 Aug 2013 21:00:21 +0000 (14:00 -0700)]

am 389e8c88: Remove old video camera icon and label from Gallery

* commit '389e8c887489db88e9324c17e8d29363198e7221':
Remove old video camera icon and label from Gallery

commit | commitdiff | tree

Doris Liu [Tue, 13 Aug 2013 19:32:19 +0000 (12:32 -0700)]

Remove old video camera icon and label from Gallery

Bug: 10296343
Change-Id: I677f5b97919ea235ac9148ca92eee2af13bc462e

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 17:49:35 +0000 (10:49 -0700)]

am 6f8d98ba: am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

* commit '6f8d98ba0a81e8ab39bed23406d33f170c7bd3ce':
Fix icons rendering to be consistent

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 17:46:01 +0000 (10:46 -0700)]

am 9ad51bd2: am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

* commit '9ad51bd2f4ad081b00281d51e257352bf9378147':
Fix icons rendering to be consistent

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 17:39:56 +0000 (10:39 -0700)]

am c41fdd6f: Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

* commit 'c41fdd6f37df5dbd7f44b1c79cdd6d025937209d':
Fix icons rendering to be consistent

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 17:38:12 +0000 (17:38 +0000)]

Merge "Fix icons rendering to be consistent" into gb-ub-photos-carlsbad

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 17:30:06 +0000 (10:30 -0700)]

Fix icons rendering to be consistent

Change-Id: Ie9384df9a34a39311dfe7ccc1cff1250d2f3918e

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 16:16:42 +0000 (09:16 -0700)]

am 9b57886d: am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit '9b57886d0f6eba16a258cea1568a4c6d2ec4473c':
add circle brush

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 16:14:55 +0000 (09:14 -0700)]

am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit 'c3606508cecf94cfde3f1a927ab926f414b83ac0':
add circle brush

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 16:12:33 +0000 (09:12 -0700)]

am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit '0bdafb193e49e2b89eeb9f4c197bbc60635c6419':
add circle brush

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 16:09:29 +0000 (16:09 +0000)]

Merge "add circle brush" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Baligh Uddin [Tue, 13 Aug 2013 07:43:47 +0000 (07:43 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Stephen Hines [Tue, 13 Aug 2013 04:53:37 +0000 (21:53 -0700)]

am d1b3e27b: (-s ours) am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

* commit 'd1b3e27b8028ee1afcc3b34e8d7b7990849131bd':
DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

commit | commitdiff | tree

Stephen Hines [Tue, 13 Aug 2013 04:51:33 +0000 (21:51 -0700)]

am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

* commit '4c89ec75151c28a905602b79f125583eba6edcd5':
DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

commit | commitdiff | tree

Stephen Hines [Tue, 13 Aug 2013 04:49:45 +0000 (21:49 -0700)]

am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

* commit '1b02bf1271af9d0f90e07ef2dd57fffd246f3b37':
DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

commit | commitdiff | tree

Stephen Hines [Tue, 13 Aug 2013 03:50:55 +0000 (20:50 -0700)]

DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.

Change-Id: I3f063cc9688fce7d22805d4dda512d486d0c1218

commit | commitdiff | tree

Ying Wang [Tue, 13 Aug 2013 04:05:06 +0000 (21:05 -0700)]

am 366c2ed3: Remove the unused libcutils.

* commit '366c2ed307e91ad1fa22554cff3a95c50c12402e':
Remove the unused libcutils.

commit | commitdiff | tree

Ying Wang [Tue, 13 Aug 2013 03:51:28 +0000 (20:51 -0700)]

Remove the unused libcutils.

Change-Id: I91b3143f0959e194b71c66ef79f37c35f7a29499

commit | commitdiff | tree

Sascha Haeberling [Tue, 13 Aug 2013 02:34:15 +0000 (19:34 -0700)]

am c20802f0: Remove all the tests from Gallery2 until we have them sorted out.

* commit 'c20802f0342125eea7d50cb313678faf5e16ca0e':
Remove all the tests from Gallery2 until we have them sorted out.

commit | commitdiff | tree

Sascha Haeberling [Tue, 13 Aug 2013 02:19:32 +0000 (19:19 -0700)]

Remove all the tests from Gallery2 until we have them sorted out.

Change-Id: I72e3f0ce477f0b0d5bca1f53feba21b6aa77e315

commit | commitdiff | tree

Qiwen Zhao [Tue, 13 Aug 2013 01:13:13 +0000 (18:13 -0700)]

Merge remote-tracking branch 'origin/klp-dev-plus-aosp' into klp-dev-plus-aosp

commit | commitdiff | tree

Bart Sears [Tue, 13 Aug 2013 01:11:19 +0000 (18:11 -0700)]

am 95599b51: am 77306b68: am 4772792d: Bump up the version number to 1.1.40010

* commit '95599b519feaa601acfcefa2fa2183610bf87ce7':

commit | commitdiff | tree

nicolasroard [Tue, 13 Aug 2013 01:11:18 +0000 (18:11 -0700)]

am 813b3fcc: am 5744809c: am 93ef658b: Add a direct rendering mode

* commit '813b3fccb5377d1f132d22a312be4b4c5a49ea23':

commit | commitdiff | tree

Michael Kolb [Tue, 13 Aug 2013 01:11:16 +0000 (18:11 -0700)]

am 86dcd3b5: am 3019162b: am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce

* commit '86dcd3b596d3ac85c81c19632ce788f7389ab469':

commit | commitdiff | tree

Michael Kolb [Tue, 13 Aug 2013 01:11:15 +0000 (18:11 -0700)]

am a7794263: am 0553910d: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

* commit 'a77942630ca7f3b0ea472f9806390977809e4e03':

commit | commitdiff | tree

Doris Liu [Tue, 13 Aug 2013 01:11:13 +0000 (18:11 -0700)]

am 1e22d9bd: am edddcab2: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

* commit '1e22d9bdda7285053ac0b57d43cef041575cc94f':

commit | commitdiff | tree

Ruben Brunk [Tue, 13 Aug 2013 01:11:12 +0000 (18:11 -0700)]

am a6ff1663: am f007ac89: am 6cfb081c: G+ crop overlay shadows. Aspect ratios.

* commit 'a6ff1663887e0e6e9fc3a60b51415f6f7873f2fe':

commit | commitdiff | tree

Bobby Georgescu [Tue, 13 Aug 2013 01:11:10 +0000 (18:11 -0700)]

am 73bfca6f: am e66f4aba: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

* commit '73bfca6f82745ff3a52f7ac03faa734b9f5d6860':

commit | commitdiff | tree

Angus Kong [Tue, 13 Aug 2013 01:11:09 +0000 (18:11 -0700)]

am a9187510: am 115e8693: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit 'a9187510448d4e5d2239ed06c137aa2d3cc0a096':

commit | commitdiff | tree

George Mount [Tue, 13 Aug 2013 01:11:08 +0000 (18:11 -0700)]

am a0ee88a4: am 0e4ba348: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

* commit 'a0ee88a40a618a514d99429d04146b64a264e3ad':

commit | commitdiff | tree

Ruben Brunk [Tue, 13 Aug 2013 01:11:06 +0000 (18:11 -0700)]

am 4f087b99: am 207b436c: am ea2fa83c: Setup geometry xforms and propogation chain.

* commit '4f087b99b8a3ab50aea097896910ca897047c62d':

commit | commitdiff | tree

Doris Liu [Tue, 13 Aug 2013 01:11:05 +0000 (18:11 -0700)]

am f141351d: am 5875c082: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce

* commit 'f141351d0008e885889e28f9773b6ba65c1951ee':

commit | commitdiff | tree

Ruben Brunk [Tue, 13 Aug 2013 01:11:03 +0000 (18:11 -0700)]

am 9fbc12ee: am 89127bbe: am 41185c4f: Fix downsampling check in crop.

* commit '9fbc12ee45b31218bfdcc6d524d4515f1f17c537':

commit | commitdiff | tree

Baligh Uddin [Tue, 13 Aug 2013 01:11:02 +0000 (18:11 -0700)]

am 4c629168: (-s ours) am ee3b727a: (-s ours) am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '4c629168e7a967032172b7135631a85c49fddbf6':

commit | commitdiff | tree

Baligh Uddin [Tue, 13 Aug 2013 01:11:00 +0000 (18:11 -0700)]

am d2021a3a: (-s ours) am a5d4147f: (-s ours) am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'd2021a3abd12133c63171ea336e83aefea409465':

commit | commitdiff | tree

John Hoford [Tue, 13 Aug 2013 00:25:02 +0000 (17:25 -0700)]

add circle brush

Change-Id: Iee5bc138599853b9c5343ae2e6f02b22ea4abe2d

commit | commitdiff | tree

Qiwen Zhao [Tue, 13 Aug 2013 00:16:57 +0000 (17:16 -0700)]

Merge remote-tracking branch 'origin/klp-dev' into klp-dev

commit | commitdiff | tree

Bart Sears [Mon, 12 Aug 2013 23:51:26 +0000 (16:51 -0700)]

am 77306b68: am 4772792d: Bump up the version number to 1.1.40010

* commit '77306b68f36f73ff1820efce55bbf901d2636790':

commit | commitdiff | tree

nicolasroard [Mon, 12 Aug 2013 23:51:25 +0000 (16:51 -0700)]

am 5744809c: am 93ef658b: Add a direct rendering mode

* commit '5744809cab0566ffc4a92add3bbe8493f16dd4ae':

commit | commitdiff | tree

Michael Kolb [Mon, 12 Aug 2013 23:51:23 +0000 (16:51 -0700)]

am 3019162b: am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce

* commit '3019162b991edf67122885988d6cdf304a4c2dc9':

commit | commitdiff | tree

Michael Kolb [Mon, 12 Aug 2013 23:51:21 +0000 (16:51 -0700)]

am 0553910d: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

* commit '0553910ded3c386c151c29a4f6737b74d75e0284':

commit | commitdiff | tree

Doris Liu [Mon, 12 Aug 2013 23:51:19 +0000 (16:51 -0700)]

am edddcab2: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

* commit 'edddcab24d1443fb1a4deccfd2d8ddff5e0dcd8d':

commit | commitdiff | tree

Ruben Brunk [Mon, 12 Aug 2013 23:51:17 +0000 (16:51 -0700)]

am f007ac89: am 6cfb081c: G+ crop overlay shadows. Aspect ratios.

* commit 'f007ac8938b401d2d780677a3f6da593d3ddd923':

commit | commitdiff | tree

Bobby Georgescu [Mon, 12 Aug 2013 23:51:16 +0000 (16:51 -0700)]

am e66f4aba: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

* commit 'e66f4abad0301965351a9c8d02f0d23449b03754':

commit | commitdiff | tree

Angus Kong [Mon, 12 Aug 2013 23:51:14 +0000 (16:51 -0700)]

am 115e8693: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit '115e86934c8e5b0be4b24d9e9ad9278425940838':

commit | commitdiff | tree

George Mount [Mon, 12 Aug 2013 23:51:12 +0000 (16:51 -0700)]

am 0e4ba348: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

* commit '0e4ba348606517ce2bfa98e8e9b684f60bf5c36b':

commit | commitdiff | tree

Ruben Brunk [Mon, 12 Aug 2013 23:51:10 +0000 (16:51 -0700)]

am 207b436c: am ea2fa83c: Setup geometry xforms and propogation chain.

* commit '207b436c9dd7e09cb8f4fe7709140ffd8967a682':

commit | commitdiff | tree

Doris Liu [Mon, 12 Aug 2013 23:51:08 +0000 (16:51 -0700)]

am 5875c082: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce

* commit '5875c082565cbaa84a6fe1ad7ccbd7ef54a27eec':

commit | commitdiff | tree

Ruben Brunk [Mon, 12 Aug 2013 23:51:07 +0000 (16:51 -0700)]

am 89127bbe: am 41185c4f: Fix downsampling check in crop.

* commit '89127bbeb7febc9dfbc678093994bc80a22ec7aa':

commit | commitdiff | tree

Baligh Uddin [Mon, 12 Aug 2013 23:51:05 +0000 (16:51 -0700)]

am ee3b727a: (-s ours) am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'ee3b727ab8aaabded1c9a34a0539b3fe11a57f3a':

commit | commitdiff | tree

Baligh Uddin [Mon, 12 Aug 2013 23:51:03 +0000 (16:51 -0700)]

am a5d4147f: (-s ours) am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'a5d4147fbe63e6383df40da7c532cf5f02aab1d6':

commit | commitdiff | tree

John Hoford [Mon, 12 Aug 2013 22:34:52 +0000 (22:34 +0000)]

Merge "fix serialization on draw" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Mon, 12 Aug 2013 22:19:20 +0000 (15:19 -0700)]

fix serialization on draw

Change-Id: Id99acdb9ac6d65e0c8239ef6737f6e6a7fe5c04b