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

John Hoford [Thu, 22 Aug 2013 23:13:34 +0000 (16:13 -0700)]

am ddf992d7: am 89cea037: am 49798939: border UI editor

* commit 'ddf992d7ed200a19e2f8c5d10b55bbcb03498c8e':
border UI editor

commit | commitdiff | tree

Mangesh Ghiware [Thu, 22 Aug 2013 23:13:33 +0000 (16:13 -0700)]

am 68625f46: am f41385b0: am 73d0f429: Add label to CameraLauncher activity-alias.

* commit '68625f46ad654a797e944a57d1c896585ffbd3a9':
Add label to CameraLauncher activity-alias.

commit | commitdiff | tree

ztenghui [Thu, 22 Aug 2013 23:13:32 +0000 (16:13 -0700)]

am 1edf47e8: am dbeedf50: am eb295038: Fix the Google Drive issue

* commit '1edf47e823fb852c982dee21b20e27095000a2ef':
Fix the Google Drive issue

commit | commitdiff | tree

John Hoford [Thu, 22 Aug 2013 23:13:32 +0000 (16:13 -0700)]

am e9315694: am e966541c: am d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad

* commit 'e9315694e17f381159437c34b6772edd4b2bd714':
fix gif issue

commit | commitdiff | tree

John Hoford [Thu, 22 Aug 2013 23:09:45 +0000 (16:09 -0700)]

am 89cea037: am 49798939: border UI editor

* commit '89cea0376a0d012c6c7f5cf7a0cd6b0e739c9a2a':
border UI editor

commit | commitdiff | tree

Mangesh Ghiware [Thu, 22 Aug 2013 23:09:45 +0000 (16:09 -0700)]

am f41385b0: am 73d0f429: Add label to CameraLauncher activity-alias.

* commit 'f41385b0488b9d52d8707a8832de799852bb38e5':
Add label to CameraLauncher activity-alias.

commit | commitdiff | tree

ztenghui [Thu, 22 Aug 2013 23:09:44 +0000 (16:09 -0700)]

am dbeedf50: am eb295038: Fix the Google Drive issue

* commit 'dbeedf500d546cf6ffe18863edeaef05d001a84e':
Fix the Google Drive issue

commit | commitdiff | tree

John Hoford [Thu, 22 Aug 2013 23:09:43 +0000 (16:09 -0700)]

am e966541c: am d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad

* commit 'e966541c27c1e00e1c0f3c4fea52cf4149f579b8':
fix gif issue

commit | commitdiff | tree

John Hoford [Thu, 22 Aug 2013 23:07:33 +0000 (16:07 -0700)]

am 49798939: border UI editor

* commit '49798939f1bc58eaf5842bbc8bc5424284ab7930':
border UI editor

commit | commitdiff | tree

Mangesh Ghiware [Thu, 22 Aug 2013 23:07:30 +0000 (16:07 -0700)]

am 73d0f429: Add label to CameraLauncher activity-alias.

* commit '73d0f42972c7c49a2589f2184f67e5a887007e7e':
Add label to CameraLauncher activity-alias.

commit | commitdiff | tree

ztenghui [Thu, 22 Aug 2013 23:07:27 +0000 (16:07 -0700)]

am eb295038: Fix the Google Drive issue

* commit 'eb2950384846a3797e13b04765f65df70d80982e':
Fix the Google Drive issue

commit | commitdiff | tree

John Hoford [Thu, 22 Aug 2013 23:07:23 +0000 (16:07 -0700)]

am d74271e5: Merge "fix gif issue" into gb-ub-photos-carlsbad

* commit 'd74271e58c33ac178d935cca6843d41de95e7fcf':
fix gif issue

commit | commitdiff | tree

John Hoford [Thu, 22 Aug 2013 21:38:19 +0000 (14:38 -0700)]

border UI editor

bug:9470514
Change-Id: I4d5cd91775c9b8742f847fd9a955f6f28e66cd38

commit | commitdiff | tree

Baligh Uddin [Thu, 22 Aug 2013 18:02:25 +0000 (11:02 -0700)]

am 66ce8dea: (-s ours) am 0c352309: (-s ours) Import translations. DO NOT MERGE

* commit '66ce8dea61d80e5ebbce6c46b75b544fa2bfe6f1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 22 Aug 2013 17:59:23 +0000 (10:59 -0700)]

am 0c352309: (-s ours) Import translations. DO NOT MERGE

* commit '0c352309f6184214c2e001b3693223279f398144':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Mangesh Ghiware [Thu, 22 Aug 2013 01:18:03 +0000 (18:18 -0700)]

Add label to CameraLauncher activity-alias.

Bug: 10430717
Change-Id: I37f9e63483211ecfe11e4790361c051d377aef55

commit | commitdiff | tree

Baligh Uddin [Wed, 21 Aug 2013 23:53:27 +0000 (16:53 -0700)]

Import translations. DO NOT MERGE

Change-Id: Icc3f76ebab854c3f6963c99326bc0a2ce2a65b19
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 21 Aug 2013 23:52:43 +0000 (16:52 -0700)]

Import translations. DO NOT MERGE

Change-Id: I563ea59646023964a852e4fd8700239dc55b4073
Auto-generated-cl: translation import

commit | commitdiff | tree

ztenghui [Tue, 20 Aug 2013 23:38:04 +0000 (16:38 -0700)]

Fix the Google Drive issue

Here a local cache file will be downloaded and sent over to Gallery / Editor.
So we need to handle that well.

bug:9356969

Change-Id: Ic09a2f5de2c9c55ca2ed21c77ddf7517f5939bfb

commit | commitdiff | tree

John Hoford [Tue, 20 Aug 2013 23:18:39 +0000 (23:18 +0000)]

Merge "fix gif issue" into gb-ub-photos-carlsbad

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 23:02:48 +0000 (16:02 -0700)]

am 901f3aea: am 1ee2d47e: am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad

* commit '901f3aea8c5644c567618410f9062d96d2527e70':
Revert to loading 8888 bitmaps

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 23:01:03 +0000 (16:01 -0700)]

am 1ee2d47e: am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad

* commit '1ee2d47e1dc72662cb63ba8c223d98f05e57ffea':
Revert to loading 8888 bitmaps

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 22:58:58 +0000 (15:58 -0700)]

am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad

* commit '82f3ed2cec637ce516cf0270dde8f910fe9f78e5':
Revert to loading 8888 bitmaps

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 22:58:10 +0000 (22:58 +0000)]

Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Tue, 20 Aug 2013 22:37:37 +0000 (15:37 -0700)]

fix gif issue

bug:7877538
Change-Id: I807198ca6d0d0db33fdbcc8b6bd1bf6dab9ba86a

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 22:46:41 +0000 (15:46 -0700)]

Revert to loading 8888 bitmaps

bug:10305385
Change-Id: I3c8ff6e848e79631f9b9e887244495b094e730a3

commit | commitdiff | tree

Mangesh Ghiware [Tue, 20 Aug 2013 22:34:57 +0000 (15:34 -0700)]

am 6529e798: am 6b1ef99f: am 675948f8: Fix discrepancy in RemoteViewsFactory impl.

* commit '6529e798150f147feaf9445edbb27c4535a48fef':
Fix discrepancy in RemoteViewsFactory impl.

commit | commitdiff | tree

Mangesh Ghiware [Tue, 20 Aug 2013 22:32:53 +0000 (15:32 -0700)]

am 6b1ef99f: am 675948f8: Fix discrepancy in RemoteViewsFactory impl.

* commit '6b1ef99f0e43564a5d7ea4e5c5e1a23baf055101':
Fix discrepancy in RemoteViewsFactory impl.

commit | commitdiff | tree

Mangesh Ghiware [Tue, 20 Aug 2013 22:31:47 +0000 (15:31 -0700)]

am 675948f8: Fix discrepancy in RemoteViewsFactory impl.

* commit '675948f8f6337fe2873067a74db789d46a41ec36':
Fix discrepancy in RemoteViewsFactory impl.

commit | commitdiff | tree

Mangesh Ghiware [Tue, 20 Aug 2013 22:09:55 +0000 (15:09 -0700)]

Fix discrepancy in RemoteViewsFactory impl.

Bug: 7633198
Change-Id: I96db437ac4452d001a2c380ecdbedee40f4c2468

commit | commitdiff | tree

John Hoford [Tue, 20 Aug 2013 19:29:14 +0000 (12:29 -0700)]

am 9095869c: am 87f067fd: am 708569b4: Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad

* commit '9095869cb4de4e00c44723f518a11a39e2b85dcf':
fix draw issues on tablet

commit | commitdiff | tree

John Hoford [Tue, 20 Aug 2013 19:27:20 +0000 (12:27 -0700)]

am 87f067fd: am 708569b4: Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad

* commit '87f067fd20908a541b3ab6a9f06d5ea30d10aa28':
fix draw issues on tablet

commit | commitdiff | tree

John Hoford [Tue, 20 Aug 2013 19:25:03 +0000 (12:25 -0700)]

am 708569b4: Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad

* commit '708569b460235ed28248de1aefdd635197d3fb28':
fix draw issues on tablet

commit | commitdiff | tree

John Hoford [Tue, 20 Aug 2013 19:22:44 +0000 (19:22 +0000)]

Merge "fix draw issues on tablet" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Tue, 20 Aug 2013 16:21:02 +0000 (09:21 -0700)]

fix draw issues on tablet

bug:8579593
Change-Id: I75c9daa4d1048b02943ab33362dd8674faa39149

commit | commitdiff | tree

Sascha Haeberling [Tue, 20 Aug 2013 17:16:48 +0000 (10:16 -0700)]

am b3ab5bda: am 778acca3: am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad

* commit 'b3ab5bda54ee05fb5622d6d475132d76d7f07745':
Prevent NPE.

commit | commitdiff | tree

Sascha Haeberling [Tue, 20 Aug 2013 17:14:35 +0000 (10:14 -0700)]

am 778acca3: am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad

* commit '778acca3b6592ab5bc150f726b68e4af24d3c7e4':
Prevent NPE.

commit | commitdiff | tree

Sascha Haeberling [Tue, 20 Aug 2013 17:13:12 +0000 (10:13 -0700)]

am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad

* commit '7a4412d19a355e78f472eba2f3a8d90234b69ee9':
Prevent NPE.

commit | commitdiff | tree

Sascha Haeberling [Tue, 20 Aug 2013 17:10:17 +0000 (17:10 +0000)]

Merge "Prevent NPE." into gb-ub-photos-carlsbad

commit | commitdiff | tree

George Mount [Tue, 20 Aug 2013 16:42:55 +0000 (09:42 -0700)]

am 10aedbc0: am 3e517506: am 2f3a8e1c: Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad

* commit '10aedbc0919361965d65a959ee369df05c78bc8c':
Allow for extension for pano-based navigation.

commit | commitdiff | tree

George Mount [Tue, 20 Aug 2013 16:37:51 +0000 (09:37 -0700)]

am 3e517506: am 2f3a8e1c: Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad

* commit '3e5175060d84f83c0b2d26c3c19e88654ec0e5bb':
Allow for extension for pano-based navigation.

commit | commitdiff | tree

George Mount [Tue, 20 Aug 2013 16:35:52 +0000 (09:35 -0700)]

am 2f3a8e1c: Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad

* commit '2f3a8e1c95e1a689086e585a9db2482dc66ea39b':
Allow for extension for pano-based navigation.

commit | commitdiff | tree

George Mount [Tue, 20 Aug 2013 16:31:01 +0000 (16:31 +0000)]

Merge "Allow for extension for pano-based navigation." into gb-ub-photos-carlsbad

commit | commitdiff | tree

Sascha Haeberling [Tue, 20 Aug 2013 01:52:13 +0000 (18:52 -0700)]

Prevent NPE.

Bug: 10388167

Change-Id: I9293d29e6a1a4f052513409b80fe7d4aaac87529

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 00:36:10 +0000 (17:36 -0700)]

am 8d02a559: am 14262b1c: am 929d90ca: Fix crash

* commit '8d02a5595b4c2941ecdc10bd84e3fc94b4fe0a06':
Fix crash

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 00:32:51 +0000 (17:32 -0700)]

am 74528bed: am 9e7a99dc: am f8b8c708: Merge "Add printing to Gallery" into gb-ub-photos-carlsbad

* commit '74528bed84088fcfc069dd762cf51c1ae8da2489':
Add printing to Gallery

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 00:32:46 +0000 (17:32 -0700)]

am 14262b1c: am 929d90ca: Fix crash

* commit '14262b1cd78295c8b803c0129502f7eeeb2ef4d4':
Fix crash

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 00:29:28 +0000 (17:29 -0700)]

am 9e7a99dc: am f8b8c708: Merge "Add printing to Gallery" into gb-ub-photos-carlsbad

* commit '9e7a99dca34431e86f6b81153623345f20be25b1':
Add printing to Gallery

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 00:29:06 +0000 (17:29 -0700)]

am 929d90ca: Fix crash

* commit '929d90ca51c2856c0a8cb5a812f0e70628bb71d7':
Fix crash

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 00:26:38 +0000 (17:26 -0700)]

Fix crash

bug:10390767
Change-Id: Ie300762048daffb80dee79e75a0993cae76bb839

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 00:26:00 +0000 (17:26 -0700)]

am f8b8c708: Merge "Add printing to Gallery" into gb-ub-photos-carlsbad

* commit 'f8b8c708f30aeb632ef7064cc5be7c65669f1762':
Add printing to Gallery

commit | commitdiff | tree

nicolasroard [Tue, 20 Aug 2013 00:24:05 +0000 (00:24 +0000)]

Merge "Add printing to Gallery" into gb-ub-photos-carlsbad

commit | commitdiff | tree

ztenghui [Tue, 20 Aug 2013 00:19:03 +0000 (17:19 -0700)]

am 074ce0a2: am f45a21d7: am 50a1674e: Merge "Check whether save button should be enabled when time bar updates" into gb-ub-photos-carlsbad

* commit '074ce0a2bc82b0315fffed4c234778887658eca8':
Check whether save button should be enabled when time bar updates

commit | commitdiff | tree

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

Add printing to Gallery

Change-Id: I26aad645759f95813003badffbd03845e0df37bb

commit | commitdiff | tree

ztenghui [Tue, 20 Aug 2013 00:15:39 +0000 (17:15 -0700)]

am f45a21d7: am 50a1674e: Merge "Check whether save button should be enabled when time bar updates" into gb-ub-photos-carlsbad

* commit 'f45a21d741e0982bf41672c2dbe9fb04edd09160':
Check whether save button should be enabled when time bar updates

commit | commitdiff | tree

ztenghui [Tue, 20 Aug 2013 00:12:52 +0000 (17:12 -0700)]

am 50a1674e: Merge "Check whether save button should be enabled when time bar updates" into gb-ub-photos-carlsbad

* commit '50a1674e3f34b6daccbb1634bd10793ee5985aaa':
Check whether save button should be enabled when time bar updates

commit | commitdiff | tree

ztenghui [Tue, 20 Aug 2013 00:09:09 +0000 (00:09 +0000)]

Merge "Check whether save button should be enabled when time bar updates" into gb-ub-photos-carlsbad

commit | commitdiff | tree

ztenghui [Mon, 19 Aug 2013 23:56:45 +0000 (16:56 -0700)]

Check whether save button should be enabled when time bar updates

bug:10260216

Change-Id: Ic9714d5b5415ddc6f181bf2caf9efedf3fd871ac

commit | commitdiff | tree

nicolasroard [Mon, 19 Aug 2013 22:54:44 +0000 (15:54 -0700)]

am ba32a076: am 93488817: am f29cc45a: Merge "Remove simple edit menu item" into gb-ub-photos-carlsbad

* commit 'ba32a07696ee9d04fbc526b413bf72e22483ed34':
Remove simple edit menu item

commit | commitdiff | tree

nicolasroard [Mon, 19 Aug 2013 22:52:29 +0000 (15:52 -0700)]

am 93488817: am f29cc45a: Merge "Remove simple edit menu item" into gb-ub-photos-carlsbad

* commit '934888173da3253d169ecacc3fed7c01bf79db3c':
Remove simple edit menu item

commit | commitdiff | tree

nicolasroard [Mon, 19 Aug 2013 22:49:31 +0000 (15:49 -0700)]

am f29cc45a: Merge "Remove simple edit menu item" into gb-ub-photos-carlsbad

* commit 'f29cc45abb96754e954d56673e3a959d8bb9787e':
Remove simple edit menu item

commit | commitdiff | tree

nicolasroard [Mon, 19 Aug 2013 22:46:57 +0000 (22:46 +0000)]

Merge "Remove simple edit menu item" into gb-ub-photos-carlsbad

commit | commitdiff | tree

nicolasroard [Mon, 19 Aug 2013 22:45:06 +0000 (15:45 -0700)]

Remove simple edit menu item

bug:10362505
Change-Id: I730457c4e0d35b48be0a71e14fac60c5194c5d1f

commit | commitdiff | tree

George Mount [Mon, 19 Aug 2013 21:36:06 +0000 (14:36 -0700)]

Allow for extension for pano-based navigation.

Bug 9265629

Change-Id: Ief895285991b2200a423636580a68f1d21a31cdf

commit | commitdiff | tree

Mangesh Ghiware [Mon, 19 Aug 2013 21:38:55 +0000 (14:38 -0700)]

am b1ab92ec: am aa67eb3c: am 571bacbd: Add flags to create new task and clear top during trampoline.

* commit 'b1ab92ec0d1c26324395348e3bb6e5c9c3da42dc':
Add flags to create new task and clear top during trampoline.

commit | commitdiff | tree

Mangesh Ghiware [Mon, 19 Aug 2013 21:37:08 +0000 (14:37 -0700)]

am aa67eb3c: am 571bacbd: Add flags to create new task and clear top during trampoline.

* commit 'aa67eb3c8c6f47ba572c340cc7655af765f22770':
Add flags to create new task and clear top during trampoline.

commit | commitdiff | tree

Mangesh Ghiware [Mon, 19 Aug 2013 21:34:34 +0000 (14:34 -0700)]

am 571bacbd: Add flags to create new task and clear top during trampoline.

* commit '571bacbd331dd9fdb57bed154ce7dbb2abfffb8b':
Add flags to create new task and clear top during trampoline.

commit | commitdiff | tree

Mangesh Ghiware [Mon, 19 Aug 2013 21:10:04 +0000 (14:10 -0700)]

Add flags to create new task and clear top during trampoline.

Bug: 10366519
Change-Id: I549c8256d18ea37ac868035e54a56e5f68840b24

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 20:10:55 +0000 (13:10 -0700)]

am e8767608: (-s ours) am e49b123b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e8767608ef996d0b52b35550cfa9c8b10e5d8362':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 20:10:55 +0000 (13:10 -0700)]

am 333cd7e2: (-s ours) am 341df06f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '333cd7e23ebbfc168be22e129fe57370cbb94826':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 20:05:55 +0000 (13:05 -0700)]

am e49b123b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'e49b123b2ca08eab82a098bcc344571ef4b32ecf':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 20:05:55 +0000 (13:05 -0700)]

am 341df06f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '341df06fafcdd06d2ca6c197b8580310624438de':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 20:04:58 +0000 (20:04 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 20:04:48 +0000 (20:04 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 20:04:35 +0000 (20:04 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 20:04:28 +0000 (20:04 +0000)]

Merge "Import translations. DO NOT MERGE" into klp-dev

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 19:47:58 +0000 (12:47 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib0c3f25daefae6b81ca8926e9e362985fa62b142
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 19:47:14 +0000 (12:47 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic35ea9733809c03d75b9b42e5d472e37e3d5628a
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 19:45:59 +0000 (12:45 -0700)]

Import translations. DO NOT MERGE

Change-Id: Id4000a77bfbbb3ed654970dd9eeecf4e5f01920b
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Mon, 19 Aug 2013 19:45:11 +0000 (12:45 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0aafd377a259a343409fb3a734ade98e65eb104b
Auto-generated-cl: translation import

commit | commitdiff | tree

Mangesh Ghiware [Mon, 19 Aug 2013 19:03:40 +0000 (12:03 -0700)]

am 1997b19d: am 5692911e: am 55705d5a: Fix RTE in PhotoPage

* commit '1997b19d37aaf5ae08a2d72437241086ff136af7':
Fix RTE in PhotoPage

commit | commitdiff | tree

Mangesh Ghiware [Mon, 19 Aug 2013 19:01:03 +0000 (12:01 -0700)]

am 5692911e: am 55705d5a: Fix RTE in PhotoPage

* commit '5692911eaa1bd34b2e2a745c8978f3ac96da4362':
Fix RTE in PhotoPage

commit | commitdiff | tree

Mangesh Ghiware [Mon, 19 Aug 2013 18:57:44 +0000 (11:57 -0700)]

am 55705d5a: Fix RTE in PhotoPage

* commit '55705d5a9baadfe0e19170b2075e4a273033c260':
Fix RTE in PhotoPage

commit | commitdiff | tree

Mangesh Ghiware [Mon, 19 Aug 2013 18:52:32 +0000 (11:52 -0700)]

Fix RTE in PhotoPage

Bug: 10341736
Change-Id: Iff005411cff8f8923c465da99804c14a3783bcf9

commit | commitdiff | tree

ztenghui [Mon, 19 Aug 2013 17:01:08 +0000 (10:01 -0700)]

am 57c6497d: am 45338df1: am 77505296: Merge "Add the intent filter for video trimming." into gb-ub-photos-carlsbad

* commit '57c6497dd24b5e82a3abdbac0e73e0500f7dd06b':
Add the intent filter for video trimming.

commit | commitdiff | tree

ztenghui [Mon, 19 Aug 2013 16:57:51 +0000 (09:57 -0700)]

am 45338df1: am 77505296: Merge "Add the intent filter for video trimming." into gb-ub-photos-carlsbad

* commit '45338df171558bfbddfef6d08f87fa98c2f3b3ea':
Add the intent filter for video trimming.

commit | commitdiff | tree

ztenghui [Mon, 19 Aug 2013 16:52:38 +0000 (09:52 -0700)]

am 77505296: Merge "Add the intent filter for video trimming." into gb-ub-photos-carlsbad

* commit '77505296d5943519b0e449edb364a6ee203496b7':
Add the intent filter for video trimming.

commit | commitdiff | tree

ztenghui [Mon, 19 Aug 2013 16:50:46 +0000 (16:50 +0000)]

Merge "Add the intent filter for video trimming." into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Mon, 19 Aug 2013 16:29:15 +0000 (09:29 -0700)]

am 0987dda5: am 63cc71a3: am a4f38c0f: fix first draw bug

* commit '0987dda5dccb01eaaaa30e698f01e12cb057b609':
fix first draw bug

commit | commitdiff | tree

John Hoford [Mon, 19 Aug 2013 16:27:00 +0000 (09:27 -0700)]

am 63cc71a3: am a4f38c0f: fix first draw bug

* commit '63cc71a312e1b9a990712714dd7643ae44b97f98':
fix first draw bug

commit | commitdiff | tree

John Hoford [Mon, 19 Aug 2013 16:25:29 +0000 (09:25 -0700)]

am a4f38c0f: fix first draw bug

* commit 'a4f38c0f8f70c998391780b672eea5d5e49277c7':
fix first draw bug

commit | commitdiff | tree

John Hoford [Thu, 15 Aug 2013 23:06:26 +0000 (16:06 -0700)]

fix first draw bug

bug:8579593
Change-Id: Ifb4727fcf23b0696db14427f00aa2a911b4a367b

commit | commitdiff | tree

ztenghui [Fri, 16 Aug 2013 23:24:55 +0000 (16:24 -0700)]

Add the intent filter for video trimming.

bug:10313015

Change-Id: I3e2ef58e065d0cdabfab6943b11b6fddc0b112eb

commit | commitdiff | tree

nicolasroard [Fri, 16 Aug 2013 22:38:31 +0000 (15:38 -0700)]

am c648ccd6: am 1b96abe8: am 9c5d6700: Implements Printing in the editor

* commit 'c648ccd6039465d95137bba6e0adc70e04e56c17':
Implements Printing in the editor

commit | commitdiff | tree

nicolasroard [Fri, 16 Aug 2013 22:35:24 +0000 (15:35 -0700)]

am 1b96abe8: am 9c5d6700: Implements Printing in the editor

* commit '1b96abe8bb3cb94b1c65f4255e7f4719387d2a26':
Implements Printing in the editor

commit | commitdiff | tree

nicolasroard [Fri, 16 Aug 2013 22:32:56 +0000 (15:32 -0700)]

am 9c5d6700: Implements Printing in the editor

* commit '9c5d6700209699c3f1a47b6fa37618ddcd2f24c3':
Implements Printing in the editor

commit | commitdiff | tree

nicolasroard [Fri, 16 Aug 2013 21:06:43 +0000 (14:06 -0700)]

Implements Printing in the editor

Change-Id: Ib307f8b9c1aaaee2ab96f8e8ddcd86abe38bdc72

commit | commitdiff | tree

nicolasroard [Fri, 16 Aug 2013 01:28:08 +0000 (18:28 -0700)]

am 84617349: am c675642e: am d33fe6fd: Fix geometry updates

* commit '8461734926e3c2a0899ac89dc2b1a8d4fc3c77ac':
Fix geometry updates

commit | commitdiff | tree

nicolasroard [Fri, 16 Aug 2013 01:25:35 +0000 (18:25 -0700)]

am c675642e: am d33fe6fd: Fix geometry updates

* commit 'c675642efbf37b35a0ed6e82b82e6038a1914c23':
Fix geometry updates

commit | commitdiff | tree

nicolasroard [Fri, 16 Aug 2013 01:23:24 +0000 (18:23 -0700)]

am d33fe6fd: Fix geometry updates

* commit 'd33fe6fd37d8c506ab0e47139ef0f77746a275b8':
Fix geometry updates