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

(root) / android-x86 / packages-apps-Gallery2.git / log

nicolasroard [Tue, 26 Feb 2013 23:02:04 +0000 (15:02 -0800)]

am 10ece61a: FilterShowActivity cleanup

* commit '10ece61a285633c1b06921ec7b8ce3c50bb37b73':
FilterShowActivity cleanup

commit | commitdiff | tree

nicolasroard [Tue, 26 Feb 2013 22:43:05 +0000 (14:43 -0800)]

FilterShowActivity cleanup

Change-Id: Iac674c6ca981b7dafb76af3602c75b925d4cbbed

commit | commitdiff | tree

John Hoford [Tue, 26 Feb 2013 21:55:34 +0000 (13:55 -0800)]

am 69cc3eba: Merge "add upoint" into gb-ub-photos-bryce

* commit '69cc3eba9a4405190d6429df52609fb0d7079c52':
add upoint

commit | commitdiff | tree

John Hoford [Tue, 26 Feb 2013 21:54:30 +0000 (21:54 +0000)]

Merge "add upoint" into gb-ub-photos-bryce

commit | commitdiff | tree

George Mount [Tue, 26 Feb 2013 20:51:11 +0000 (12:51 -0800)]

am c8419b4e: Add initial implementation of PhotosProvider.

* commit 'c8419b4e5e3302f2efc7ea629891041a14219aa7':
Add initial implementation of PhotosProvider.

commit | commitdiff | tree

George Mount [Thu, 21 Feb 2013 01:01:54 +0000 (17:01 -0800)]

Add initial implementation of PhotosProvider.

Change-Id: I98694cf54bd0fb549703a7184e1816e9590a05ff

commit | commitdiff | tree

John Hoford [Tue, 26 Feb 2013 01:39:01 +0000 (17:39 -0800)]

add upoint

Change-Id: I484d2c6658e4ea06e22fa037ef2262c17b9e8d79

commit | commitdiff | tree

nicolasroard [Tue, 26 Feb 2013 17:03:49 +0000 (09:03 -0800)]

am db4cedf1: Disable full res when dealing with jpeg orientation

* commit 'db4cedf1feb3899840963b2648dc3e2b4d0a1d6f':
Disable full res when dealing with jpeg orientation

commit | commitdiff | tree

nicolasroard [Tue, 26 Feb 2013 16:53:29 +0000 (08:53 -0800)]

Disable full res when dealing with jpeg orientation

Change-Id: Ie29f25addcb66a6c8a2effa2bfbf89155ce6465a

commit | commitdiff | tree

nicolasroard [Tue, 26 Feb 2013 06:11:48 +0000 (22:11 -0800)]

am a3a4c954: Fix compare swipe

* commit 'a3a4c954c6917375a852d3f3c64d0c76693b5677':
Fix compare swipe

commit | commitdiff | tree

nicolasroard [Tue, 26 Feb 2013 05:04:58 +0000 (21:04 -0800)]

Fix compare swipe

bug:8266511

commit | commitdiff | tree

nicolasroard [Tue, 26 Feb 2013 04:52:10 +0000 (20:52 -0800)]

am 8b4c7f99: Merge "Fix crash on applying borders" into gb-ub-photos-bryce

* commit '8b4c7f99ddd23cfba032f1f2f878d644f0659972':
Fix crash on applying borders

commit | commitdiff | tree

nicolasroard [Tue, 26 Feb 2013 04:50:31 +0000 (04:50 +0000)]

Merge "Fix crash on applying borders" into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Tue, 26 Feb 2013 04:38:25 +0000 (20:38 -0800)]

Fix crash on applying borders

bug:8265497

Change-Id: I7e6b22cb7666fd3876119051552e34e91df894a2

commit | commitdiff | tree

Michael Kolb [Tue, 26 Feb 2013 04:24:47 +0000 (20:24 -0800)]

am e858477f: Merge "Use cross fade rotation animation" into gb-ub-photos-bryce

* commit 'e858477ff8ed81b39031f1197ed6d92de56e51f6':
Use cross fade rotation animation

commit | commitdiff | tree

Michael Kolb [Tue, 26 Feb 2013 04:23:35 +0000 (04:23 +0000)]

Merge "Use cross fade rotation animation" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Tue, 26 Feb 2013 03:43:56 +0000 (19:43 -0800)]

Use cross fade rotation animation

Bug: 8257846

Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c

commit | commitdiff | tree

Ruben Brunk [Tue, 26 Feb 2013 03:09:12 +0000 (19:09 -0800)]

am 21a01faa: Fixed more of filtershows large bitmap reference leaks.

* commit '21a01faab1125c5c347a3dfbf6a71de6aec233a1':
Fixed more of filtershows large bitmap reference leaks.

commit | commitdiff | tree

Ruben Brunk [Tue, 26 Feb 2013 01:18:51 +0000 (17:18 -0800)]

Fixed more of filtershows large bitmap reference leaks.

Bug: 8253109
Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772

commit | commitdiff | tree

Baligh Uddin [Mon, 25 Feb 2013 18:00:43 +0000 (10:00 -0800)]

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

* commit '313a20935178edcf34fcd8ecdf394c82f0b3d2dd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 25 Feb 2013 18:00:43 +0000 (10:00 -0800)]

am 47b0fd0a: (-s ours) Import translations. DO NOT MERGE

* commit '47b0fd0a0fabeec59f92690ee619319c61221874':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 25 Feb 2013 18:00:15 +0000 (18:00 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Mon, 25 Feb 2013 17:59:50 +0000 (17:59 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Mon, 25 Feb 2013 15:42:02 +0000 (07:42 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 25 Feb 2013 15:41:41 +0000 (07:41 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 25 Feb 2013 15:41:18 +0000 (07:41 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 25 Feb 2013 15:40:31 +0000 (07:40 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Doris Liu [Sat, 23 Feb 2013 00:07:19 +0000 (16:07 -0800)]

am e455b777: Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce

* commit 'e455b777139921c5e72a9afca3f9ba3ae21975ba':
Release surface texture to fix gray camera preview

commit | commitdiff | tree

Doris Liu [Sat, 23 Feb 2013 00:04:21 +0000 (00:04 +0000)]

Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce

commit | commitdiff | tree

John Reck [Fri, 22 Feb 2013 23:45:07 +0000 (15:45 -0800)]

am 5f30b98d: Start of photos

* commit '5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820':
Start of photos

commit | commitdiff | tree

Doris Liu [Fri, 22 Feb 2013 22:31:17 +0000 (14:31 -0800)]

Release surface texture to fix gray camera preview

Bug: 8133672

Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80

commit | commitdiff | tree

Baligh Uddin [Fri, 22 Feb 2013 23:14:31 +0000 (23:14 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

John Reck [Fri, 15 Feb 2013 22:32:08 +0000 (14:32 -0800)]

Start of photos

Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75

commit | commitdiff | tree

Baligh Uddin [Fri, 22 Feb 2013 22:25:32 +0000 (14:25 -0800)]

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

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

commit | commitdiff | tree

Baligh Uddin [Fri, 22 Feb 2013 22:23:17 +0000 (22:23 +0000)]

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

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 22:00:21 +0000 (14:00 -0800)]

am d5633ea9: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce

* commit 'd5633ea950ab82be13189705004ce97bce6a5715':
Stopgap fixes for more of the photo editor's memory issues.

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 21:58:33 +0000 (21:58 +0000)]

Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]

Stopgap fixes for more of the photo editor's memory issues.

Bug: 8253109
Bug: 8233895
Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 21:49:12 +0000 (13:49 -0800)]

am ddec680a: Merge "Revert "Stopgap fixes for more of the photo editor\'s memory issues."" into gb-ub-photos-bryce

* commit 'ddec680a6d4604bc6fd44b29dfbf964422f40fcb':
Revert "Stopgap fixes for more of the photo editor's memory issues."

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 21:47:06 +0000 (21:47 +0000)]

Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 21:45:26 +0000 (21:45 +0000)]

Revert "Stopgap fixes for more of the photo editor's memory issues."

This reverts commit 4c91156f9a2e48ebaec86e3a46ea9b7855392cfd

Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 21:44:01 +0000 (13:44 -0800)]

am fc673e13: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce

* commit 'fc673e131aa3482e5202fad1b54208442df35c2c':
Stopgap fixes for more of the photo editor's memory issues.

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 21:41:03 +0000 (21:41 +0000)]

Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]

Stopgap fixes for more of the photo editor's memory issues.

Bug: 8253109
Bug: 8233895
Change-Id: I676b6749f3b273a431323609add01e82b88db456

commit | commitdiff | tree

Bobby Georgescu [Fri, 22 Feb 2013 21:05:41 +0000 (13:05 -0800)]

am fae7bf85: Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce

* commit 'fae7bf8557f7de818a768d7a8c30425a9a5641d8':
Replace various BitmapPools with a smarter unified pool

commit | commitdiff | tree

Bobby Georgescu [Fri, 22 Feb 2013 21:03:45 +0000 (21:03 +0000)]

Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Tue, 19 Feb 2013 23:49:14 +0000 (15:49 -0800)]

Replace various BitmapPools with a smarter unified pool

Make all of gallery use a single shared pool, and pave the
way for making the pool more adaptive based on the current
workload.

Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac

commit | commitdiff | tree

nicolasroard [Fri, 22 Feb 2013 19:43:14 +0000 (11:43 -0800)]

am ea332c69: Don\'t apply the filters twice in partial rendering...

* commit 'ea332c69f084322ebdd13419424ee5fab2351760':
Don't apply the filters twice in partial rendering...

commit | commitdiff | tree

nicolasroard [Fri, 22 Feb 2013 19:35:41 +0000 (11:35 -0800)]

Don't apply the filters twice in partial rendering...

Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 17:54:35 +0000 (09:54 -0800)]

am 2c87aafc: Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce

* commit '2c87aafc0e4c5f67fe41c0cac301eabb6d5c716e':
Move setting wallpaper to a background thread.

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)]

Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Fri, 22 Feb 2013 04:13:20 +0000 (20:13 -0800)]

Move setting wallpaper to a background thread.

Bug: 8088767
Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3

commit | commitdiff | tree

Baligh Uddin [Fri, 22 Feb 2013 16:16:53 +0000 (08:16 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 22 Feb 2013 16:15:57 +0000 (08:15 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

nicolasroard [Fri, 22 Feb 2013 01:48:52 +0000 (17:48 -0800)]

am e5498da0: Pinch to zoom refine

* commit 'e5498da0262fc836738aad63ea30286d8afa643c':
Pinch to zoom refine

commit | commitdiff | tree

nicolasroard [Thu, 21 Feb 2013 23:52:49 +0000 (15:52 -0800)]

Pinch to zoom refine

Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a

commit | commitdiff | tree

Ruben Brunk [Thu, 21 Feb 2013 23:53:07 +0000 (15:53 -0800)]

am 0f8047fe: Fix for null check with RS allocations.

* commit '0f8047fe826a84829ab37bc7cd24c8a4dea0db64':
Fix for null check with RS allocations.

commit | commitdiff | tree

Ruben Brunk [Thu, 21 Feb 2013 23:43:33 +0000 (15:43 -0800)]

Fix for null check with RS allocations.

Bug: 8243554
Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7

commit | commitdiff | tree

John Hoford [Thu, 21 Feb 2013 23:30:53 +0000 (15:30 -0800)]

am 2fc7efdc: fix draw and ellipse to handle pinch to zoom

* commit '2fc7efdcd75279649091471dda3ee600db25a995':
fix draw and ellipse to handle pinch to zoom

commit | commitdiff | tree

John Hoford [Thu, 21 Feb 2013 23:18:37 +0000 (15:18 -0800)]

fix draw and ellipse to handle pinch to zoom

Change-Id: I8af9b37dcd98425959742a4142756963363d1cec

commit | commitdiff | tree

Michael Kolb [Thu, 21 Feb 2013 23:11:31 +0000 (15:11 -0800)]

am 8539fc1a: Adjust capture animation timing

* commit '8539fc1a5406af9edd5414fba3615cc045aa63ec':
Adjust capture animation timing

commit | commitdiff | tree

Michael Kolb [Thu, 21 Feb 2013 19:37:45 +0000 (11:37 -0800)]

Adjust capture animation timing

Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb

commit | commitdiff | tree

Ruben Brunk [Thu, 21 Feb 2013 22:17:50 +0000 (14:17 -0800)]

am e406ec4d: Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce

* commit 'e406ec4ddcfe6336c4119de9044b27f38197fff7':
Temporary handling when running out of heap in filtershow.

commit | commitdiff | tree

John Hoford [Thu, 21 Feb 2013 22:17:49 +0000 (14:17 -0800)]

am 8921c28c: add highlight filter

* commit '8921c28c7333ad2b4d34f013904ad4737044f366':
add highlight filter

commit | commitdiff | tree

nicolasroard [Thu, 21 Feb 2013 22:17:48 +0000 (14:17 -0800)]

am 91b80b25: Remove SliderController class

* commit '91b80b2560e663b15ee75ab1bca775028c7868c0':
Remove SliderController class

commit | commitdiff | tree

Jason Noguchi [Thu, 21 Feb 2013 22:17:48 +0000 (14:17 -0800)]

am 48f739a3: Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block o

* commit '48f739a395194ffcd589751c8689a75721b2ce97':
Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite.

commit | commitdiff | tree

nicolasroard [Thu, 21 Feb 2013 22:17:47 +0000 (14:17 -0800)]

am 431aa19d: Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce

* commit '431aa19d3ab2e9d7d87ef6ee67984a4c649841c0':
Remove slider in ImageShow, cleanup code

commit | commitdiff | tree

Doris Liu [Thu, 21 Feb 2013 22:17:46 +0000 (14:17 -0800)]

am 8850b8e7: Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce

* commit '8850b8e776d984a3924e9849629f096c57920a7a':
Fix NPE for when camera is disabled

commit | commitdiff | tree

nicolasroard [Thu, 21 Feb 2013 22:17:45 +0000 (14:17 -0800)]

am 969fc020: Fix typo

* commit '969fc02063b47fc2151a6fc6ef9af9793da4c08a':
Fix typo

commit | commitdiff | tree

Ruben Brunk [Thu, 21 Feb 2013 21:12:21 +0000 (21:12 +0000)]

Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Thu, 21 Feb 2013 06:45:55 +0000 (22:45 -0800)]

Temporary handling when running out of heap in filtershow.

Bug: 8233895
Change-Id: Id078d2a4b387127c0d230bc5d9de4590f0e9f72b

commit | commitdiff | tree

John Hoford [Thu, 21 Feb 2013 01:50:42 +0000 (17:50 -0800)]

add highlight filter

Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872

commit | commitdiff | tree

nicolasroard [Thu, 21 Feb 2013 17:52:14 +0000 (09:52 -0800)]

Remove SliderController class

Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331

commit | commitdiff | tree

Jason Noguchi [Thu, 21 Feb 2013 04:33:47 +0000 (04:33 +0000)]

Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite." into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Thu, 21 Feb 2013 04:07:27 +0000 (04:07 +0000)]

Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Thu, 21 Feb 2013 03:36:46 +0000 (03:36 +0000)]

Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce

commit | commitdiff | tree

nicolasroard [Thu, 21 Feb 2013 03:32:37 +0000 (19:32 -0800)]

Remove slider in ImageShow, cleanup code

Change-Id: I005d4ecd33a5b6fcd23af6a6ba46419e7c9fc683

commit | commitdiff | tree

nicolasroard [Thu, 21 Feb 2013 01:44:51 +0000 (17:44 -0800)]

Fix typo

Change-Id: I6c41782a033d5ad1bb5780b22d99658223b23a0b

commit | commitdiff | tree

nicolasroard [Thu, 21 Feb 2013 01:08:05 +0000 (17:08 -0800)]

am df0b0c4e: Add pinch to zoom

* commit 'df0b0c4eaafcc9e4652fe6ec0791e4abe1c3b750':
Add pinch to zoom

commit | commitdiff | tree

nicolasroard [Fri, 15 Feb 2013 00:33:01 +0000 (16:33 -0800)]

Add pinch to zoom

Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a

commit | commitdiff | tree

Doris Liu [Thu, 21 Feb 2013 00:29:44 +0000 (16:29 -0800)]

Fix NPE for when camera is disabled

Bug: 7950211
Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639

commit | commitdiff | tree

Jason Noguchi [Wed, 20 Feb 2013 22:42:27 +0000 (14:42 -0800)]

Scaling down the stress test defaults iteration counts to some base level.
For true stress testing, need to pass arguments to scale these back up to 100.
Also, temporarily removing SwitchPreview test which needs updating and currently
would block other tests in stress suite.

Change-Id: I9dd92e0090e2554aca5cb4b23fed2d33554c9c5e

commit | commitdiff | tree

Ruben Brunk [Wed, 20 Feb 2013 23:36:19 +0000 (15:36 -0800)]

am 88158f57: Removed unsupported GL operations.

* commit '88158f577a2d80a7a3ab5ad92452b6e32b059271':
Removed unsupported GL operations.

commit | commitdiff | tree

Ruben Brunk [Wed, 20 Feb 2013 22:44:02 +0000 (14:44 -0800)]

Removed unsupported GL operations.

Bug: 8223749
Change-Id: I722220def36aa4a9e53666540471100df6609d74

commit | commitdiff | tree

Ed Heyl [Wed, 20 Feb 2013 21:47:32 +0000 (13:47 -0800)]

Merge remote-tracking branch 'goog/jb-mr2-release'

commit | commitdiff | tree

Victor Doba [Wed, 20 Feb 2013 17:31:38 +0000 (09:31 -0800)]

am c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce

* commit 'c8e006639baf1512715e0d7f2c02f88204ab55c0':
Show the Utility Panel by default.

commit | commitdiff | tree

Victor Doba [Wed, 20 Feb 2013 17:29:53 +0000 (17:29 +0000)]

Merge "Show the Utility Panel by default." into gb-ub-photos-bryce

commit | commitdiff | tree

John Hoford [Wed, 20 Feb 2013 16:45:14 +0000 (08:45 -0800)]

am 1863a311: fix vignette startup issues

* commit '1863a3119a802517b1c2a53763f904f73fdc940b':
fix vignette startup issues

commit | commitdiff | tree

John Hoford [Wed, 20 Feb 2013 16:31:40 +0000 (08:31 -0800)]

fix vignette startup issues

Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f

commit | commitdiff | tree

The Android Automerger [Wed, 20 Feb 2013 13:56:07 +0000 (05:56 -0800)]

merge in jb-mr2-release history after reset to master

commit | commitdiff | tree

John Hoford [Tue, 19 Feb 2013 23:35:59 +0000 (15:35 -0800)]

am a93d5ee9: add movable vignette

* commit 'a93d5ee9c409e2328dcbe2326591436f8ac23146':
add movable vignette

commit | commitdiff | tree

John Hoford [Sat, 16 Feb 2013 17:20:59 +0000 (09:20 -0800)]

add movable vignette

Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d

commit | commitdiff | tree

Baligh Uddin [Tue, 19 Feb 2013 19:23:32 +0000 (11:23 -0800)]

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

* commit '03010e45387b8f1a715fd7f5cfac0793008fdc9b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 19 Feb 2013 19:23:18 +0000 (19:23 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Tue, 19 Feb 2013 19:22:16 +0000 (19:22 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 19 Feb 2013 19:21:08 +0000 (19:21 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Tue, 19 Feb 2013 19:14:23 +0000 (11:14 -0800)]

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

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