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

Bobby Georgescu [Tue, 23 Apr 2013 10:50:13 +0000 (03:50 -0700)]

am 5dccb63e: am ca6f04e2: Remove dead code

* commit '5dccb63ecbcd869cdf06a306396c6726b726f778':
Remove dead code

nicolasroard [Tue, 23 Apr 2013 10:50:12 +0000 (03:50 -0700)]

am ae1b2a55: am d97733b2: Strings update

* commit 'ae1b2a552cd76f66db4da3ac1713e4dbb584be4c':
Strings update

Nicolas Roard [Tue, 23 Apr 2013 10:50:11 +0000 (03:50 -0700)]

am 9b407b5f: am bb894c4f: Merge "String updates." into gb-ub-photos-bryce

* commit '9b407b5fba68a82f98f3d71f48c7cffec161b3fe':
String updates.

commit | commitdiff | tree

Michael Kolb [Tue, 23 Apr 2013 10:50:11 +0000 (03:50 -0700)]

am 36affdf2: am 237216ee: Rename scenemode AUTO to NONE

* commit '36affdf28ccc181c1151c757a57d7fdfe03ec254':
Rename scenemode AUTO to NONE

commit | commitdiff | tree

Ruben Brunk [Tue, 23 Apr 2013 10:50:10 +0000 (03:50 -0700)]

am 413fa970: am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce

* commit '413fa9709da680b650c3c8d9ac4c5884a461fb46':
Ensure consistent image thumbnail handling.

commit | commitdiff | tree

Ruben Brunk [Tue, 23 Apr 2013 10:50:10 +0000 (03:50 -0700)]

am 6e2b9c13: am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce

* commit '6e2b9c136000dcb4bf38b5c89d67e0e10d6fd696':
Fix saved video timestamps.

commit | commitdiff | tree

Chad Jones [Tue, 23 Apr 2013 10:50:09 +0000 (03:50 -0700)]

am 41d628b3: Merge commit \'91d26f6c\' into jb-mr2-dev

* commit '41d628b3c5bbad3cf52bfc7fac47b7b14b91b8aa':

commit | commitdiff | tree

Bobby Georgescu [Mon, 22 Apr 2013 17:13:44 +0000 (10:13 -0700)]

am ca6f04e2: Remove dead code

* commit 'ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac':
Remove dead code

commit | commitdiff | tree

Bobby Georgescu [Sat, 20 Apr 2013 17:26:15 +0000 (10:26 -0700)]

Remove dead code

Bug: 8672542
Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e

commit | commitdiff | tree

nicolasroard [Sat, 20 Apr 2013 05:29:49 +0000 (22:29 -0700)]

am d97733b2: Strings update

* commit 'd97733b2d3cd1fe7398bb399a1fbd227ef0ba746':
Strings update

commit | commitdiff | tree

Nicolas Roard [Sat, 20 Apr 2013 05:29:48 +0000 (22:29 -0700)]

am bb894c4f: Merge "String updates." into gb-ub-photos-bryce

* commit 'bb894c4f321b27ede8e97c42117973376bbaf32f':
String updates.

commit | commitdiff | tree

Michael Kolb [Sat, 20 Apr 2013 05:29:47 +0000 (22:29 -0700)]

am 237216ee: Rename scenemode AUTO to NONE

* commit '237216eeba5c05d63aa075ac8dc4af423044f302':
Rename scenemode AUTO to NONE

commit | commitdiff | tree

Ruben Brunk [Sat, 20 Apr 2013 05:29:47 +0000 (22:29 -0700)]

am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce

* commit 'f53eea80c773a1686631f9e2ec6edab23c8944b5':
Ensure consistent image thumbnail handling.

commit | commitdiff | tree

Ruben Brunk [Sat, 20 Apr 2013 05:29:46 +0000 (22:29 -0700)]

am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce

* commit 'afc46d5a608ccfc1f370cc705e0c27eb0b678ded':
Fix saved video timestamps.

commit | commitdiff | tree

Chad Jones [Sat, 20 Apr 2013 04:17:52 +0000 (21:17 -0700)]

Merge commit '91d26f6c' into jb-mr2-dev

commit | commitdiff | tree

Chad Jones [Sat, 20 Apr 2013 04:17:25 +0000 (21:17 -0700)]

Merge commit '91d26f6c' into jb-mr2-dev-plus-aosp

commit | commitdiff | tree

nicolasroard [Sat, 20 Apr 2013 00:15:51 +0000 (17:15 -0700)]

Strings update

bug:8664728
Change-Id: I8844ebb6557bbc5e8ea31277f164fdb61afadfd9

commit | commitdiff | tree

Nicolas Roard [Sat, 20 Apr 2013 00:13:11 +0000 (00:13 +0000)]

Merge "String updates." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Sat, 20 Apr 2013 00:03:05 +0000 (17:03 -0700)]

String updates.

Bug: 8664728
Change-Id: Idc23ab0d75a9f1656c5e38a0b0e318a63d6875b5

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 23:23:28 +0000 (16:23 -0700)]

Rename scenemode AUTO to NONE

Bug: 8660834

Change-Id: Ia2900821c5983d3e4fe3a6aeab720f2070c7ebfa

commit | commitdiff | tree

Ruben Brunk [Fri, 19 Apr 2013 22:54:43 +0000 (22:54 +0000)]

Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Fri, 19 Apr 2013 22:43:05 +0000 (22:43 +0000)]

Merge "Fix saved video timestamps." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Fri, 19 Apr 2013 22:41:28 +0000 (15:41 -0700)]

Ensure consistent image thumbnail handling.

Bug: 7192433

Change-Id: Ie86ade06b7234681a0d955a87cacfb337bc39145

commit | commitdiff | tree

Ruben Brunk [Fri, 19 Apr 2013 22:27:57 +0000 (15:27 -0700)]

Fix saved video timestamps.

Bug: 8002939
Change-Id: I771b2b4082acd19bbf9b52c65f51da9489827c18

commit | commitdiff | tree

John Hoford [Fri, 19 Apr 2013 01:43:29 +0000 (18:43 -0700)]

tiny planet fix

bug:8323524
Change-Id: I39283face7079574dbe25e797323a84141930f9a

commit | commitdiff | tree

John Reck [Fri, 19 Apr 2013 21:51:57 +0000 (21:51 +0000)]

Merge "Remove photos from gallery2 manifest" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 21:19:47 +0000 (14:19 -0700)]

am 7530c16b: am beba6b1c: Merge "Fix labels" into gb-ub-photos-bryce

* commit '7530c16b98f03930c6f644853f97eb6bfa7819b7':
Fix labels

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 21:15:07 +0000 (14:15 -0700)]

am beba6b1c: Merge "Fix labels" into gb-ub-photos-bryce

* commit 'beba6b1c36f79aded98f71dbf45454dd947ce7b8':
Fix labels

commit | commitdiff | tree

John Reck [Fri, 19 Apr 2013 17:04:12 +0000 (10:04 -0700)]

Remove photos from gallery2 manifest

Bug: 8659787

Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 21:11:59 +0000 (21:11 +0000)]

Merge "Fix labels" into gb-ub-photos-bryce

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 21:05:51 +0000 (14:05 -0700)]

am eb985346: am 935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce

* commit 'eb9853468e2bc9f54fdc1f5ec4e883627228bea4':
Make MediaSaveService destroyed after unbound.

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 21:05:51 +0000 (14:05 -0700)]

am 1bfd6aff: am ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce

* commit '1bfd6affbc079073d8b13f23b821e84f10a27cfa':
Save video using MediaSaveService.

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 21:04:01 +0000 (14:04 -0700)]

Fix labels

Bug: 8660834

Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 21:04:00 +0000 (14:04 -0700)]

am 935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce

* commit '935d4c8037d7b5f56e4dea1c96bd8f4b68cb6236':
Make MediaSaveService destroyed after unbound.

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 21:03:59 +0000 (14:03 -0700)]

am ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce

* commit 'ca3875b21375defd0d42c57c05994cd67f0d59cd':
Save video using MediaSaveService.

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 21:01:35 +0000 (21:01 +0000)]

Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 21:01:15 +0000 (21:01 +0000)]

Merge "Save video using MediaSaveService." into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Fri, 19 Apr 2013 19:54:07 +0000 (12:54 -0700)]

am 50e2d80f: am faf2f040: Fix multi selection issue

* commit '50e2d80fbe4087c5a54e0f6e62181d83f07f00bc':
Fix multi selection issue

commit | commitdiff | tree

Bobby Georgescu [Fri, 19 Apr 2013 19:47:41 +0000 (12:47 -0700)]

am faf2f040: Fix multi selection issue

* commit 'faf2f040f38532213fa237cf45c9794cf1a85859':
Fix multi selection issue

commit | commitdiff | tree

Angus Kong [Wed, 17 Apr 2013 22:37:07 +0000 (15:37 -0700)]

Save video using MediaSaveService.

bug:8511719
Change-Id: I3fc5054bf7661953181b27e66cc70ba95082d36c

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 19:28:58 +0000 (12:28 -0700)]

Make MediaSaveService destroyed after unbound.

bug:8528779
Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b

commit | commitdiff | tree

Bobby Georgescu [Fri, 19 Apr 2013 18:27:29 +0000 (11:27 -0700)]

Fix multi selection issue

Bug: 8663155
Change-Id: Ic6aa98c04b5134df9deb1b14736e614bf1618f03

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 17:41:52 +0000 (10:41 -0700)]

am f5d5c639: am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce

* commit 'f5d5c63904ee5eb70b2088d0ed27b3bc5fbc5c57':
Lock camera orientation using FW API

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 17:38:00 +0000 (10:38 -0700)]

am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce

* commit '32049103305c99e8be1f7af3e46933277e02a7c3':
Lock camera orientation using FW API

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 17:34:08 +0000 (17:34 +0000)]

Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 17:29:37 +0000 (10:29 -0700)]

am 2163b6f8: am 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce

* commit '2163b6f83ffa252e177c9f9f214c6dfdd79d0d6d':
Pass the camera to recorders after all is set.

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 17:27:38 +0000 (10:27 -0700)]

am 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce

* commit '45826e188598cd6171fc0ec3112e2fbf52fbc952':
Pass the camera to recorders after all is set.

commit | commitdiff | tree

Angus Kong [Fri, 19 Apr 2013 17:25:58 +0000 (17:25 +0000)]

Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Fri, 19 Apr 2013 17:23:10 +0000 (10:23 -0700)]

am f5f23189: am b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce

* commit 'f5f23189e0219a4bed7f108057018c2807ddd5e3':
Fix memory leak in pie controller

commit | commitdiff | tree

Doris Liu [Fri, 19 Apr 2013 17:23:09 +0000 (10:23 -0700)]

am 66f7e7d7: am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce

* commit '66f7e7d7c431b10c8336b6c7baddf150fbfbba5b':
Allow swiping to filmstrip from blocker bar

commit | commitdiff | tree

Doris Liu [Fri, 19 Apr 2013 17:20:32 +0000 (10:20 -0700)]

am b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce

* commit 'b10518142bb84abe2ffe1bd3aa10ff4ee7982370':
Fix memory leak in pie controller

commit | commitdiff | tree

Doris Liu [Fri, 19 Apr 2013 17:20:31 +0000 (10:20 -0700)]

am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce

* commit '14fe288784c574c84edbf84306329dc8b70d8b4d':
Allow swiping to filmstrip from blocker bar

commit | commitdiff | tree

Doris Liu [Fri, 19 Apr 2013 17:17:59 +0000 (17:17 +0000)]

Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Fri, 19 Apr 2013 17:17:44 +0000 (17:17 +0000)]

Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 17:14:18 +0000 (10:14 -0700)]

am a2fb4deb: am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce

* commit 'a2fb4deb06d9d8c4b7fb1f5c6191ee1b06cc5355':
Drop in new assets of correct size

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 17:11:24 +0000 (10:11 -0700)]

am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce

* commit 'a7e098c8e798160fdc2410867ec7eba325b7cd96':
Drop in new assets of correct size

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 17:09:40 +0000 (17:09 +0000)]

Merge "Drop in new assets of correct size" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Fri, 19 Apr 2013 15:56:07 +0000 (08:56 -0700)]

Drop in new assets of correct size

Bug: 8640131

Change-Id: Iefcff08ae190c07700b5526a6847b664fe1b51a7

commit | commitdiff | tree

Ruben Brunk [Fri, 19 Apr 2013 03:22:26 +0000 (20:22 -0700)]

am 1e17e692: am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce

* commit '1e17e69237eaa80b1c48d1dcff1ee3a71000d4ee':
Fix crop activity aspect ratio and orientation handling.

commit | commitdiff | tree

Ruben Brunk [Fri, 19 Apr 2013 03:20:19 +0000 (20:20 -0700)]

am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce

* commit '316af8dd675d777f4bd9512b8af5391c7c89363f':
Fix crop activity aspect ratio and orientation handling.

commit | commitdiff | tree

Ruben Brunk [Fri, 19 Apr 2013 03:16:53 +0000 (03:16 +0000)]

Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce

commit | commitdiff | tree

John Hoford [Fri, 19 Apr 2013 01:45:53 +0000 (18:45 -0700)]

am a2b7cea2: am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce

* commit 'a2b7cea2ee21c48f7f4b53236c58159e92ecb113':
fixed borders issues

commit | commitdiff | tree

John Hoford [Fri, 19 Apr 2013 01:44:01 +0000 (18:44 -0700)]

am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce

* commit 'a1939d22f631ddcb7e942cc0ad2ffa7ef78b763f':
fixed borders issues

commit | commitdiff | tree

John Hoford [Fri, 19 Apr 2013 01:41:44 +0000 (01:41 +0000)]

Merge "fixed borders issues" into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Fri, 19 Apr 2013 00:14:51 +0000 (17:14 -0700)]

Fix memory leak in pie controller

Bug: 7622218
Change-Id: Iaab96008a4f4b506bb0be98f489af9120d607251

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 23:22:27 +0000 (16:22 -0700)]

Fix crop activity aspect ratio and orientation handling.

Bug: 8659064
Bug: 8647628
Change-Id: I3e4293cc3bba7d55334acb396e20a23cc92f8f82

commit | commitdiff | tree

Flavio Lerda [Thu, 18 Apr 2013 23:04:12 +0000 (16:04 -0700)]

am 7f5d0331: am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce

* commit '7f5d0331b16923df1eec2501ba0709c05c845c74':
Remove unused imports.

commit | commitdiff | tree

Flavio Lerda [Thu, 18 Apr 2013 23:00:40 +0000 (16:00 -0700)]

am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce

* commit 'ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d':
Remove unused imports.

commit | commitdiff | tree

Angus Kong [Thu, 18 Apr 2013 22:57:08 +0000 (15:57 -0700)]

Pass the camera to recorders after all is set.

bug:8049369
Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5

commit | commitdiff | tree

Flavio Lerda [Thu, 18 Apr 2013 22:57:36 +0000 (22:57 +0000)]

Merge "Remove unused imports." into gb-ub-photos-bryce

commit | commitdiff | tree

Flavio Lerda [Thu, 18 Apr 2013 21:51:46 +0000 (22:51 +0100)]

Remove unused imports.

This is follow-up on the previous fix for b/8433834, addressing reviewer
comments.

Bug: 8433834
Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d

commit | commitdiff | tree

Michael Kolb [Thu, 18 Apr 2013 22:24:39 +0000 (15:24 -0700)]

am 59c8f492: am 5b083f89: Add more menu options/icons

* commit '59c8f492a413cbd786c9051fe765621ecec23c51':
Add more menu options/icons

commit | commitdiff | tree

Michael Kolb [Thu, 18 Apr 2013 22:20:30 +0000 (15:20 -0700)]

am 5b083f89: Add more menu options/icons

* commit '5b083f89c9c87f8e19e0942d1d7c2de623e527be':
Add more menu options/icons

commit | commitdiff | tree

Michael Kolb [Thu, 18 Apr 2013 19:31:10 +0000 (12:31 -0700)]

Add more menu options/icons

Bug: 8640131

Added location and scene mode to secondary menu
Updated HDR icons

Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4

commit | commitdiff | tree

George Mount [Thu, 18 Apr 2013 21:26:52 +0000 (14:26 -0700)]

am a9fbbc0c: am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce

* commit 'a9fbbc0ca0a348a0b5d302d130395f35cf88a1db':
Change labels so that it doesn't clash with PanoUiLib.

commit | commitdiff | tree

George Mount [Thu, 18 Apr 2013 21:23:11 +0000 (14:23 -0700)]

am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce

* commit 'b726c83ab60b0ec8e93cad9724857999b3bb8ec5':
Change labels so that it doesn't clash with PanoUiLib.

commit | commitdiff | tree

George Mount [Thu, 18 Apr 2013 21:20:31 +0000 (21:20 +0000)]

Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Tue, 16 Apr 2013 16:50:56 +0000 (09:50 -0700)]

Allow swiping to filmstrip from blocker bar

Bug: 8607910
Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c

commit | commitdiff | tree

John Hoford [Thu, 18 Apr 2013 03:40:25 +0000 (20:40 -0700)]

fixed borders issues

bug:8315216
Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 18:44:14 +0000 (11:44 -0700)]

am 8a931f9d: am c3178ca4: Gallery crop uses new activity. Fixed image quality.

* commit '8a931f9d440e2ce415048401e23a42aedb0c8abd':
Gallery crop uses new activity. Fixed image quality.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 18:40:49 +0000 (11:40 -0700)]

am c3178ca4: Gallery crop uses new activity. Fixed image quality.

* commit 'c3178ca4daf7ed570f3432f3433959c208ecc105':
Gallery crop uses new activity. Fixed image quality.

commit | commitdiff | tree

Ruben Brunk [Tue, 16 Apr 2013 23:17:45 +0000 (16:17 -0700)]

Gallery crop uses new activity. Fixed image quality.

Bug: 8639287
Bug: 8617799
Bug: 8600483
Bug: 8586301
Bug: 8526929
Bug: 8181859
Bug: 7561681

Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e

commit | commitdiff | tree

George Mount [Thu, 18 Apr 2013 17:15:40 +0000 (10:15 -0700)]

Change labels so that it doesn't clash with PanoUiLib.

Bug 8401273
PanoUiLib is required for all Gallery Wolfie UI.

Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:44:38 +0000 (07:44 -0700)]

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

* commit '42a13dcbfe3def75ceba13740fd1d01d30d2284c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:44:38 +0000 (07:44 -0700)]

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

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

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:41:32 +0000 (07:41 -0700)]

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

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

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:41:31 +0000 (07:41 -0700)]

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

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

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:41:14 +0000 (07:41 -0700)]

am 86def04c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '86def04cbab343bd12c1be3a286bf8260e604c23':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:41:14 +0000 (07:41 -0700)]

am 17d1c732: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '17d1c73295822b0d79d2dd50a66a6c68d5a1328c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:40:06 +0000 (14:40 +0000)]

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:39:53 +0000 (14:39 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:39:04 +0000 (14:39 +0000)]

Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

commit | commitdiff | tree

Baligh Uddin [Thu, 18 Apr 2013 14:38:29 +0000 (14:38 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

commit | commitdiff | tree

Flavio Lerda [Thu, 18 Apr 2013 13:24:05 +0000 (06:24 -0700)]

am 9581384f: am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce

* commit '9581384f4bb5d167883ef14aadf8ef8462dc8815':
Usage statistics for sharing.

commit | commitdiff | tree

Flavio Lerda [Thu, 18 Apr 2013 13:22:14 +0000 (06:22 -0700)]

am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce

* commit '47f28614605a19726d2ab81b90333ba718223b72':
Usage statistics for sharing.

commit | commitdiff | tree

Flavio Lerda [Thu, 18 Apr 2013 13:19:39 +0000 (13:19 +0000)]

Merge "Usage statistics for sharing." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 02:54:15 +0000 (19:54 -0700)]

am 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves.

* commit '5ed8e518b4208e3d748aa421778a885a95f17756':
Remove call to superclass onTouch in curves.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 02:51:45 +0000 (19:51 -0700)]

am 61f3f111: Remove call to superclass onTouch in curves.

* commit '61f3f1113a5b4f8583fd9fcae4d24734617cae21':
Remove call to superclass onTouch in curves.

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 01:55:53 +0000 (18:55 -0700)]

Remove call to superclass onTouch in curves.

Bug: 8523301
Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f

commit | commitdiff | tree

Ruben Brunk [Thu, 18 Apr 2013 01:56:12 +0000 (18:56 -0700)]

am 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce

* commit '550a4871904503748660f0d4fc524e83a5756707':
Remove redeye filter.