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

Owen Lin [Tue, 16 Oct 2012 03:25:27 +0000 (20:25 -0700)]

am 61d96679: am 2380da24: am 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

* commit '61d96679eb31261d0c01768d2dd8d03dd7a184e1':
Revert "Revert "Upload screennails in tiles to prevent jank""

commit | commitdiff | tree

John Reck [Tue, 16 Oct 2012 03:25:26 +0000 (20:25 -0700)]

am d2abf50e: am b9a4bd22: am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches

* commit 'd2abf50eeefa3476477dea72eb08590abf65cfc1':
Fix build

commit | commitdiff | tree

John Hoford [Tue, 16 Oct 2012 03:25:25 +0000 (20:25 -0700)]

am a17c1824: am e4a3a434: am c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches

* commit 'a17c182423e6213ee47cb3c8ff76c9b9abb629f5':
fix for the cache

commit | commitdiff | tree

Mangesh Ghiware [Tue, 16 Oct 2012 03:25:24 +0000 (20:25 -0700)]

am 260bcee5: am 1db393b5: am cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches

* commit '260bcee54b21f34320aa500923b12c590c612243':
Cherry-pick of 092fd92 to fix bug 7344730 also.

commit | commitdiff | tree

John Reck [Tue, 16 Oct 2012 03:25:22 +0000 (20:25 -0700)]

am 2e1f4ccb: am d36b534d: am 2f17145b: am b1a28418: Fix SRI Pano orientation

* commit '2e1f4ccb0bf8ac2b8695adb4bcfd0de54bd923f4':
Fix SRI Pano orientation

commit | commitdiff | tree

Owen Lin [Tue, 16 Oct 2012 03:19:35 +0000 (20:19 -0700)]

am 2380da24: am 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

* commit '2380da248380582bd9c6714091678ceb236391be':
Revert "Revert "Upload screennails in tiles to prevent jank""

commit | commitdiff | tree

John Reck [Tue, 16 Oct 2012 03:18:38 +0000 (20:18 -0700)]

am b9a4bd22: am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches

* commit 'b9a4bd22de1a6ae236722d9155798fcded37d58b':
Fix build

commit | commitdiff | tree

John Hoford [Tue, 16 Oct 2012 03:18:37 +0000 (20:18 -0700)]

am e4a3a434: am c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches

* commit 'e4a3a4340fa65b4e0eab28e2677d914944561571':
fix for the cache

commit | commitdiff | tree

Mangesh Ghiware [Tue, 16 Oct 2012 03:18:10 +0000 (20:18 -0700)]

am 1db393b5: am cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches

* commit '1db393b595edd2b138c29e69cc47a154533befb3':
Cherry-pick of 092fd92 to fix bug 7344730 also.

commit | commitdiff | tree

John Reck [Tue, 16 Oct 2012 03:18:08 +0000 (20:18 -0700)]

am d36b534d: am 2f17145b: am b1a28418: Fix SRI Pano orientation

* commit 'd36b534dc6c90f713624b90283188510188708cc':
Fix SRI Pano orientation

commit | commitdiff | tree

Owen Lin [Tue, 16 Oct 2012 02:25:18 +0000 (19:25 -0700)]

am 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

* commit '4e13f7b0f1344e1d02d4746786a1fbc1d031fafd':
Revert "Revert "Upload screennails in tiles to prevent jank""

commit | commitdiff | tree

Owen Lin [Tue, 16 Oct 2012 02:23:04 +0000 (19:23 -0700)]

am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

* commit 'ff025412e2cacedd8cbb7901140e580f76634ee6':
Revert "Revert "Upload screennails in tiles to prevent jank""

commit | commitdiff | tree

Owen Lin [Tue, 16 Oct 2012 02:20:57 +0000 (19:20 -0700)]

Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches

commit | commitdiff | tree

John Reck [Tue, 16 Oct 2012 00:13:19 +0000 (17:13 -0700)]

am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches

* commit '94dbd96dea60224e2c3bc7c148af147fe3f83bcb':
Fix build

commit | commitdiff | tree

John Reck [Tue, 16 Oct 2012 00:10:37 +0000 (17:10 -0700)]

am a38801ed: Merge "Fix build" into gb-ub-photos-arches

* commit 'a38801edd3a39d888bf36607b567171f8b9527ad':
Fix build

commit | commitdiff | tree

John Reck [Tue, 16 Oct 2012 00:09:04 +0000 (17:09 -0700)]

Merge "Fix build" into gb-ub-photos-arches

commit | commitdiff | tree

John Reck [Tue, 16 Oct 2012 00:08:10 +0000 (17:08 -0700)]

Fix build

Change-Id: Ic7bb61c463d237f9ee5fabc8e7f7325ecf1da43c

commit | commitdiff | tree

John Hoford [Mon, 15 Oct 2012 23:56:55 +0000 (16:56 -0700)]

am c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches

* commit 'c80b4f8f61ce08d674cdb632a91c22648833eab9':
fix for the cache

commit | commitdiff | tree

John Hoford [Mon, 15 Oct 2012 23:54:20 +0000 (16:54 -0700)]

am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches

* commit '80789c089e8795968426838ff9c1e71c84cfee6f':
fix for the cache

commit | commitdiff | tree

John Hoford [Mon, 15 Oct 2012 23:52:53 +0000 (16:52 -0700)]

Merge "fix for the cache" into gb-ub-photos-arches

commit | commitdiff | tree

John Hoford [Mon, 15 Oct 2012 22:51:02 +0000 (15:51 -0700)]

fix for the cache

Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff
bug:7345592

commit | commitdiff | tree

Mangesh Ghiware [Mon, 15 Oct 2012 23:46:15 +0000 (16:46 -0700)]

am cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches

* commit 'cc7731acd44f98ef35da82904caf4a015a7b427a':
Cherry-pick of 092fd92 to fix bug 7344730 also.

commit | commitdiff | tree

Mangesh Ghiware [Mon, 15 Oct 2012 23:43:55 +0000 (16:43 -0700)]

am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches

* commit 'c42bb220434926c23332c0f93baad4ca2c6b7588':
Cherry-pick of 092fd92 to fix bug 7344730 also.

commit | commitdiff | tree

John Reck [Mon, 15 Oct 2012 23:42:45 +0000 (16:42 -0700)]

am 2f17145b: am b1a28418: Fix SRI Pano orientation

* commit '2f17145b0c82fff64f2f1667889ce2fe2920d83e':
Fix SRI Pano orientation

commit | commitdiff | tree

Mangesh Ghiware [Mon, 15 Oct 2012 23:42:17 +0000 (16:42 -0700)]

Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches

commit | commitdiff | tree

John Reck [Mon, 15 Oct 2012 23:40:45 +0000 (16:40 -0700)]

am b1a28418: Fix SRI Pano orientation

* commit 'b1a28418848ce0adeb8a845a78e246b01913d176':
Fix SRI Pano orientation

commit | commitdiff | tree

John Reck [Mon, 15 Oct 2012 23:11:04 +0000 (16:11 -0700)]

Fix SRI Pano orientation

Bug: 7345511

Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829

commit | commitdiff | tree

Chih-Chung Chang [Fri, 12 Oct 2012 10:54:06 +0000 (18:54 +0800)]

Cherry-pick of 092fd92 to fix bug 7344730 also.

Make getSupportedOperations() call getSupportedOperations(boolean) by default.

So things will work for MediaObject who doesn't override the new method.

Bug: 7336562
Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 16:11:00 +0000 (09:11 -0700)]

am 4c0875cf: am 0ecfd51a: am 3105cbbf: am f034e3d9: Update the assets of unlock and camera icons in filmstrip.

* commit '4c0875cf2c29473abbc6eb97b605bed0ac8d8871':
Update the assets of unlock and camera icons in filmstrip.

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 16:08:54 +0000 (09:08 -0700)]

am 0ecfd51a: am 3105cbbf: am f034e3d9: Update the assets of unlock and camera icons in filmstrip.

* commit '0ecfd51ac9bc6bfb85715074d68a9e3fc7035fb9':
Update the assets of unlock and camera icons in filmstrip.

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 16:06:49 +0000 (09:06 -0700)]

am 3105cbbf: am f034e3d9: Update the assets of unlock and camera icons in filmstrip.

* commit '3105cbbf72122263294b2446eca724138b33ae94':
Update the assets of unlock and camera icons in filmstrip.

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 16:05:14 +0000 (09:05 -0700)]

am f034e3d9: Update the assets of unlock and camera icons in filmstrip.

* commit 'f034e3d9b5d72ebea44d4928fb449a4cf239c3e1':
Update the assets of unlock and camera icons in filmstrip.

commit | commitdiff | tree

The Android Open Source Project [Mon, 15 Oct 2012 14:43:09 +0000 (07:43 -0700)]

am 62d93e76: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '62d93e7675b62f5302858904bf3e72f37b8985dc':

commit | commitdiff | tree

The Android Open Source Project [Mon, 15 Oct 2012 14:40:07 +0000 (07:40 -0700)]

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I79f06be720b91834009bc78383223aa98a0c1de5

commit | commitdiff | tree

The Android Automerger [Mon, 15 Oct 2012 13:59:36 +0000 (06:59 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 10:20:32 +0000 (18:20 +0800)]

Update the assets of unlock and camera icons in filmstrip.

bug:7318891
Change-Id: Ia74e8a78aa712432cd8a87b061c609cce223cf37

commit | commitdiff | tree

Jason Chen [Mon, 15 Oct 2012 06:11:11 +0000 (23:11 -0700)]

am edd2f273: am 49e5ba70: am 8a5b667d: Merge "Let\'s enhance." into jb-mr1-dev

* commit 'edd2f27388d1ecf2465a07a89a4735e1ce50ea70':
Let's enhance.

commit | commitdiff | tree

Jason Chen [Mon, 15 Oct 2012 06:08:04 +0000 (23:08 -0700)]

am 49e5ba70: am 8a5b667d: Merge "Let\'s enhance." into jb-mr1-dev

* commit '49e5ba706740998e9255ae8316af4ebb35a3372b':
Let's enhance.

commit | commitdiff | tree

Jason Chen [Mon, 15 Oct 2012 06:04:43 +0000 (23:04 -0700)]

am 8a5b667d: Merge "Let\'s enhance." into jb-mr1-dev

* commit '8a5b667d0f9a07ae29aefe7e50fed89a57578e57':
Let's enhance.

commit | commitdiff | tree

Jason Chen [Mon, 15 Oct 2012 06:01:15 +0000 (23:01 -0700)]

Merge "Let's enhance." into jb-mr1-dev

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 05:39:24 +0000 (22:39 -0700)]

am fdacb93b: am d86d7c03: am 504d7c83: am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches

* commit 'fdacb93b8f77763b39fe4266b214a6c47adc02ce':
Add stitching panorama image to secure album.

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 05:37:59 +0000 (22:37 -0700)]

am d86d7c03: am 504d7c83: am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches

* commit 'd86d7c03a024d2be365f740679d6d73544276a07':
Add stitching panorama image to secure album.

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 05:37:00 +0000 (22:37 -0700)]

am 504d7c83: am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches

* commit '504d7c832aa66773b9bea262a69c609195506ae8':
Add stitching panorama image to secure album.

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 05:35:26 +0000 (22:35 -0700)]

am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches

* commit '7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8':
Add stitching panorama image to secure album.

commit | commitdiff | tree

Wu-cheng Li [Mon, 15 Oct 2012 05:34:06 +0000 (22:34 -0700)]

Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches

commit | commitdiff | tree

The Android Automerger [Sun, 14 Oct 2012 13:59:28 +0000 (06:59 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 02:32:13 +0000 (19:32 -0700)]

am 035df371: am 2938a545: am 1aff8e6f: am 5ec40a6b: Fix dimensions to use dips instead of pixels

* commit '035df371573a75a83bdbd09d028c27ba652e2272':
Fix dimensions to use dips instead of pixels

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 02:30:18 +0000 (19:30 -0700)]

am 2938a545: am 1aff8e6f: am 5ec40a6b: Fix dimensions to use dips instead of pixels

* commit '2938a54505894da06daebab893581f17d903c01e':
Fix dimensions to use dips instead of pixels

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 02:28:21 +0000 (19:28 -0700)]

am 1aff8e6f: am 5ec40a6b: Fix dimensions to use dips instead of pixels

* commit '1aff8e6f3090ccae53bcb6b3a1f35fb58c3705ee':
Fix dimensions to use dips instead of pixels

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 02:25:38 +0000 (19:25 -0700)]

am 5ec40a6b: Fix dimensions to use dips instead of pixels

* commit '5ec40a6ba587fa8bd50958d263bb6fc6280de4c1':
Fix dimensions to use dips instead of pixels

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 01:38:51 +0000 (18:38 -0700)]

Fix dimensions to use dips instead of pixels

bug:7343798
Change-Id: I3d576ae334e580ad9da5b56d4ae84f749004ec21

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 01:14:34 +0000 (18:14 -0700)]

am b6ddee8a: am 4857dae6: am cd3803c2: am b470b229: Fix cropping and saving issues

* commit 'b6ddee8aff1e3b90076b480e74b9bc897281d3fb':
Fix cropping and saving issues

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 01:12:44 +0000 (18:12 -0700)]

am 4857dae6: am cd3803c2: am b470b229: Fix cropping and saving issues

* commit '4857dae60e15d4453eb9638c623f3abb02295bf2':
Fix cropping and saving issues

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 01:11:37 +0000 (18:11 -0700)]

am cd3803c2: am b470b229: Fix cropping and saving issues

* commit 'cd3803c20d25dce03a8cd0450dc97b5b8e7d07c6':
Fix cropping and saving issues

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 01:09:53 +0000 (18:09 -0700)]

am b470b229: Fix cropping and saving issues

* commit 'b470b229fbfd782db6758f331e4a6f918e305b02':
Fix cropping and saving issues

commit | commitdiff | tree

nicolasroard [Sun, 14 Oct 2012 00:24:31 +0000 (17:24 -0700)]

Fix cropping and saving issues

bug:7342359

Change-Id: Ia59eb3f423b8c4f420b7b6f120735856a84cd854

commit | commitdiff | tree

The Android Automerger [Sat, 13 Oct 2012 10:50:18 +0000 (03:50 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Wu-cheng Li [Sat, 13 Oct 2012 07:07:27 +0000 (15:07 +0800)]

Add stitching panorama image to secure album.

bug:7285105
Change-Id: I9f609f30d817f10a6c9c94fc6eadb58bc1bdd580

commit | commitdiff | tree

Bobby Georgescu [Sat, 13 Oct 2012 02:41:29 +0000 (19:41 -0700)]

am f0792564: am 297f25f7: am 367707d4: am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches

* commit 'f0792564da921e88a74a5ac2d40b2776f0ab7598':
Hide Camera button on empty gallery when not available

commit | commitdiff | tree

Bobby Georgescu [Sat, 13 Oct 2012 02:40:33 +0000 (19:40 -0700)]

am 297f25f7: am 367707d4: am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches

* commit '297f25f7fcc362d6771c30318e58bdcae4533d58':
Hide Camera button on empty gallery when not available

commit | commitdiff | tree

Bobby Georgescu [Sat, 13 Oct 2012 02:39:14 +0000 (19:39 -0700)]

am 367707d4: am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches

* commit '367707d4186d0d79401184a9db5b1ffe83374337':
Hide Camera button on empty gallery when not available

commit | commitdiff | tree

Bobby Georgescu [Sat, 13 Oct 2012 02:37:01 +0000 (19:37 -0700)]

am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches

* commit '48b63eecbc15ff6ec7e152076262c7dab26e5a6f':
Hide Camera button on empty gallery when not available

commit | commitdiff | tree

Bobby Georgescu [Sat, 13 Oct 2012 02:35:21 +0000 (19:35 -0700)]

Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches

commit | commitdiff | tree

Bobby Georgescu [Sat, 13 Oct 2012 01:00:51 +0000 (18:00 -0700)]

Hide Camera button on empty gallery when not available

Bug: 7342583
Change-Id: I545b6902f994f7ed0245ec486e78693aea197a4a

commit | commitdiff | tree

The Android Automerger [Fri, 12 Oct 2012 23:34:38 +0000 (16:34 -0700)]

merge in jb-mr1-factory-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Automerger [Fri, 12 Oct 2012 23:32:57 +0000 (16:32 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Jason Chen [Fri, 12 Oct 2012 17:42:06 +0000 (10:42 -0700)]

Let's enhance.

Add mipmap-xxhdpi launcher icon asset.

Bug: 6718166
Change-Id: Iedb9a380fc6b1e7045bed84164792f8a51ddcd01

commit | commitdiff | tree

John Hoford [Fri, 12 Oct 2012 22:23:50 +0000 (15:23 -0700)]

am ee40e118: am c9938264: am 1e89d463: am 9b302e31: Icon fix

* commit 'ee40e1188609780deefa677aaaaf3c5722166201':
Icon fix

commit | commitdiff | tree

John Hoford [Fri, 12 Oct 2012 22:22:21 +0000 (15:22 -0700)]

am c9938264: am 1e89d463: am 9b302e31: Icon fix

* commit 'c9938264f5e596d0040fab90e29055b9b86ceb0e':
Icon fix

commit | commitdiff | tree

John Hoford [Fri, 12 Oct 2012 22:20:16 +0000 (15:20 -0700)]

am 1e89d463: am 9b302e31: Icon fix

* commit '1e89d46332ef6fbe78864abada8d77da2be9504c':
Icon fix

commit | commitdiff | tree

John Hoford [Fri, 12 Oct 2012 22:18:06 +0000 (15:18 -0700)]

am 9b302e31: Icon fix

* commit '9b302e31fb92408e1b631988320981910edb8c37':
Icon fix

commit | commitdiff | tree

John Hoford [Fri, 12 Oct 2012 22:07:49 +0000 (15:07 -0700)]

Icon fix

bug:7328726
Change-Id: I9042c1de718b316e92bcc44700a514542af6dd65

commit | commitdiff | tree

Bobby Georgescu [Fri, 12 Oct 2012 21:15:39 +0000 (14:15 -0700)]

am ebaf3118: am 17d8b846: am 2b652421: am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches

* commit 'ebaf3118100263254612327405e558d83c28b312':
Improve performance of filmstrip

commit | commitdiff | tree

Bobby Georgescu [Fri, 12 Oct 2012 21:12:59 +0000 (14:12 -0700)]

am 17d8b846: am 2b652421: am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches

* commit '17d8b8469a80fee24487ef6b0419c3f784b6b928':
Improve performance of filmstrip

commit | commitdiff | tree

Bobby Georgescu [Fri, 12 Oct 2012 21:11:35 +0000 (14:11 -0700)]

am 2b652421: am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches

* commit '2b652421321fa6b5ac119be3512d0dbba2bbaa18':
Improve performance of filmstrip

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Oct 2012 21:11:00 +0000 (14:11 -0700)]

am 4ceeeb98: am b1bb424c: am eea31d9a: am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches

* commit '4ceeeb980eb42d4e4dd15522c10b231c7693026a':
Adding crop UI. Fixes a number of other UI bugs.

commit | commitdiff | tree

Bobby Georgescu [Fri, 12 Oct 2012 21:09:56 +0000 (14:09 -0700)]

am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches

* commit '1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb':
Improve performance of filmstrip

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Oct 2012 21:09:23 +0000 (14:09 -0700)]

am b1bb424c: am eea31d9a: am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches

* commit 'b1bb424cc01e2970a2aaec671e76de20f95756e6':
Adding crop UI. Fixes a number of other UI bugs.

commit | commitdiff | tree

Bobby Georgescu [Fri, 12 Oct 2012 21:08:03 +0000 (14:08 -0700)]

Merge "Improve performance of filmstrip" into gb-ub-photos-arches

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Oct 2012 21:06:50 +0000 (14:06 -0700)]

am eea31d9a: am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches

* commit 'eea31d9ac9890128ca0ab9529cfc6eb22a3756bf':
Adding crop UI. Fixes a number of other UI bugs.

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Oct 2012 21:04:46 +0000 (14:04 -0700)]

am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches

* commit '7776408c5bbd4bb2669b7a577d157dc1967e434e':
Adding crop UI. Fixes a number of other UI bugs.

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Oct 2012 21:02:27 +0000 (14:02 -0700)]

Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Oct 2012 12:52:06 +0000 (05:52 -0700)]

Adding crop UI. Fixes a number of other UI bugs.

Bug:7337191
Change-Id: If63dbdac6722ad4fc6c30c165d6c2eeb7011c240

commit | commitdiff | tree

The Android Automerger [Fri, 12 Oct 2012 18:50:13 +0000 (11:50 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Bobby Georgescu [Fri, 12 Oct 2012 00:53:22 +0000 (17:53 -0700)]

Improve performance of filmstrip

Bug: 7336758

Change-Id: I22dbf2e75bc069341a9bbc2c4dcdf7750f23be7f

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:17:45 +0000 (11:17 -0700)]

am c1afe725: (-s ours) am 64d28ec4: am a1a4eb63: am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:17:44 +0000 (11:17 -0700)]

am 95faa897: (-s ours) am b2152cd4: am 664b8541: Import translations. DO NOT MERGE

* commit '95faa8972f4a421c875d1180b12ff4b2c348cc75':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:15:41 +0000 (11:15 -0700)]

am 64d28ec4: am a1a4eb63: am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE

* commit '64d28ec48b0d17dc713a6a3f1118f3c9bcc5d471':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:15:40 +0000 (11:15 -0700)]

am b2152cd4: am 664b8541: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:14:21 +0000 (11:14 -0700)]

am 0ed91f2b: (-s ours) am 8d7f607d: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Oct 2012 18:14:20 +0000 (11:14 -0700)]

am 71f5a423: am b27631ba: am add0373f: am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches

* commit '71f5a4239bbd6c86d57eccba132516b2da8cd9ff':
Moves matrix function to GeometryMetadata. Fixes scaling issues.

commit | commitdiff | tree

nicolasroard [Fri, 12 Oct 2012 18:14:19 +0000 (11:14 -0700)]

am 910e4286: am 9f252960: am 4b2aad53: am 143a4eb4: Fix XML layout

* commit '910e4286f7cb82f7a5fc41768f3d8f44a5b1673a':
Fix XML layout

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:12:07 +0000 (11:12 -0700)]

am a1a4eb63: am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:12:06 +0000 (11:12 -0700)]

am 664b8541: Import translations. DO NOT MERGE

* commit '664b8541ffb24b77085a3dd0edac1ecc5b36d277':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:10:41 +0000 (11:10 -0700)]

am 8d7f607d: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Oct 2012 18:10:31 +0000 (11:10 -0700)]

am b27631ba: am add0373f: am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches

* commit 'b27631ba57f39d902fafd7c7ea15dca6ffa09d38':
Moves matrix function to GeometryMetadata. Fixes scaling issues.

commit | commitdiff | tree

nicolasroard [Fri, 12 Oct 2012 18:10:03 +0000 (11:10 -0700)]

am 9f252960: am 4b2aad53: am 143a4eb4: Fix XML layout

* commit '9f252960ba55262cbdf8f5be03d4650821c0384b':
Fix XML layout

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:09:47 +0000 (11:09 -0700)]

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

* commit '43b6cf3abce288ee5f26ebe4a904e0ef2b5041c6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Oct 2012 18:09:25 +0000 (11:09 -0700)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Chih-Chung Chang [Fri, 12 Oct 2012 18:07:26 +0000 (11:07 -0700)]

am 29838768: am 2c4fc37c: am 9a635f78: Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev

* commit '29838768af9dc8e31f4cba601a28e1c164c4694f':
Make getSupportedOperations() call getSupportedOperations(boolean) by default.