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

nicolasroard [Tue, 27 Aug 2013 16:53:24 +0000 (09:53 -0700)]

am 51713de0: am 8141e241: Merge "Improves UI / size" into gb-ub-photos-carlsbad

* commit '51713de0b3710ca90bc1d3b454cbdcee482b22dc':
Improves UI / size

commit | commitdiff | tree

nicolasroard [Tue, 27 Aug 2013 16:49:28 +0000 (09:49 -0700)]

am 8141e241: Merge "Improves UI / size" into gb-ub-photos-carlsbad

* commit '8141e2414467458c6e98b40845fc22a9cdcfffb0':
Improves UI / size

commit | commitdiff | tree

nicolasroard [Tue, 27 Aug 2013 16:48:08 +0000 (16:48 +0000)]

Merge "Improves UI / size" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Tue, 27 Aug 2013 16:06:01 +0000 (09:06 -0700)]

am 1b982d48: am 61c634ab: fix selection bug

* commit '1b982d48cb86753c9605bf60a733dcfb1fceda69':
fix selection bug

commit | commitdiff | tree

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

am 61c634ab: fix selection bug

* commit '61c634ab70a10cbd68482ad03caa4470e9e9ecc5':
fix selection bug

commit | commitdiff | tree

nicolasroard [Fri, 23 Aug 2013 07:10:01 +0000 (00:10 -0700)]

Improves UI / size

- improves overdraw
- filter change anim
- better borders
- remove unused images

bug:9470514
bug:8658176

Change-Id: I764879be415acbfba5a36f239d1905ec54e2d3cb

commit | commitdiff | tree

John Hoford [Tue, 27 Aug 2013 01:02:28 +0000 (18:02 -0700)]

fix selection bug

bug:4174707
Change-Id: Ia1a465e9f27d920d53545cba4c96dd3eab92e374

commit | commitdiff | tree

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

am ad88a94e: am 0594bd40: Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad

* commit 'ad88a94e96f30821598c9cc580e39db89510ccde':
fix menu indicator inconsistency

commit | commitdiff | tree

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

am d6de983c: am 3e6ca169: Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad

* commit 'd6de983cf0e2d6b31ed73fc75ee9eae013718ff3':
Prevent slide show request with only on slide

commit | commitdiff | tree

John Hoford [Mon, 26 Aug 2013 22:14:56 +0000 (15:14 -0700)]

am 0594bd40: Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad

* commit '0594bd40959aaa55ec4f4204fbe3d12240f51480':
fix menu indicator inconsistency

commit | commitdiff | tree

John Hoford [Mon, 26 Aug 2013 22:14:55 +0000 (15:14 -0700)]

am 3e6ca169: Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad

* commit '3e6ca1692d499fce6842c00428368598b68b86cb':
Prevent slide show request with only on slide

commit | commitdiff | tree

John Hoford [Mon, 26 Aug 2013 22:12:55 +0000 (22:12 +0000)]

Merge "fix menu indicator inconsistency" into gb-ub-photos-carlsbad

commit | commitdiff | tree

John Hoford [Mon, 26 Aug 2013 22:12:44 +0000 (22:12 +0000)]

Merge "Prevent slide show request with only on slide" into gb-ub-photos-carlsbad

commit | commitdiff | tree

Sascha Haeberling [Mon, 26 Aug 2013 22:05:46 +0000 (15:05 -0700)]

am 87863a9f: am fa2b9222: Make parsing integers for details dialog more robust.

* commit '87863a9f3104a870916adcf3e096fc98d0adcfd2':
Make parsing integers for details dialog more robust.

commit | commitdiff | tree

Sascha Haeberling [Mon, 26 Aug 2013 22:02:30 +0000 (15:02 -0700)]

am d818d9f6: am dc514bb1: Add .gitignore to Gallery2

* commit 'd818d9f6cfa0811f40f70912aae845918a264e5c':
Add .gitignore to Gallery2

commit | commitdiff | tree

Sascha Haeberling [Mon, 26 Aug 2013 22:02:05 +0000 (15:02 -0700)]

am 106b5333: am 5996f435: I18N the Gallery\'s Details dialog.

* commit '106b533374ef3e5a898fe64cc6da7b9964f6d1e7':
I18N the Gallery's Details dialog.

commit | commitdiff | tree

Baligh Uddin [Mon, 26 Aug 2013 22:00:56 +0000 (15:00 -0700)]

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

* commit '8119844cfdb392c793497b1a304d756374d0c426':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 26 Aug 2013 22:00:53 +0000 (15:00 -0700)]

am 8f7811d2: (-s ours) Import translations. DO NOT MERGE

* commit '8f7811d20123f004e78ee572092069dbcc2dd72d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Sascha Haeberling [Mon, 26 Aug 2013 21:56:41 +0000 (14:56 -0700)]

am fa2b9222: Make parsing integers for details dialog more robust.

* commit 'fa2b9222725e96fdb584aca1b1213b0bda8af110':
Make parsing integers for details dialog more robust.

commit | commitdiff | tree

Sascha Haeberling [Mon, 26 Aug 2013 21:41:46 +0000 (14:41 -0700)]

Make parsing integers for details dialog more robust.

Bug: 7141309

Also make sure "orientation" is localized.

Change-Id: Ib950eca6becd2eed21bebfbd48e11a182b76e45a

commit | commitdiff | tree

John Hoford [Mon, 26 Aug 2013 21:39:10 +0000 (14:39 -0700)]

fix menu indicator inconsistency

bug:10492779
Change-Id: I5746bb2e8066ec985423a9d972d44593653d3c31

commit | commitdiff | tree

John Hoford [Fri, 23 Aug 2013 21:29:46 +0000 (14:29 -0700)]

Prevent slide show request with only on slide

bug:8794694
Change-Id: Id3354733c7f35d9303b01f07ddf30f5555b07ddd

commit | commitdiff | tree

Sascha Haeberling [Fri, 23 Aug 2013 21:49:27 +0000 (14:49 -0700)]

am dc514bb1: Add .gitignore to Gallery2

* commit 'dc514bb1f6ad5927d76c5f5a52742428cb0846fa':
Add .gitignore to Gallery2

commit | commitdiff | tree

Sascha Haeberling [Fri, 23 Aug 2013 20:48:00 +0000 (13:48 -0700)]

Add .gitignore to Gallery2

Change-Id: I071eb063f3cb26ee42134462958f49342ec54cd9

commit | commitdiff | tree

Sascha Haeberling [Fri, 23 Aug 2013 20:43:06 +0000 (13:43 -0700)]

am 5996f435: I18N the Gallery\'s Details dialog.

* commit '5996f43546b629a01166904943eda1f788078634':
I18N the Gallery's Details dialog.

commit | commitdiff | tree

Sascha Haeberling [Fri, 23 Aug 2013 20:29:42 +0000 (13:29 -0700)]

I18N the Gallery's Details dialog.

Bug: 7141309

Change-Id: I9e658ea3972713fa39e76894f8ae7d8e3d5cdf2c

commit | commitdiff | tree

Baligh Uddin [Fri, 23 Aug 2013 19:03:13 +0000 (19:03 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Fri, 23 Aug 2013 17:23:37 +0000 (10:23 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

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

Import translations. DO NOT MERGE

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

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 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: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: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: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: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: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: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: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

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: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: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: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: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: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: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: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: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 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: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: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