OSDN Git Service
Bobby Georgescu [Mon, 5 Nov 2012 23:43:26 +0000 (15:43 -0800)]
am
aa43c5e0: am
e7e4f11e: am
34347598: am
1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
* commit '
aa43c5e0d2a72050d553f9bd28ec573fd5fd254f':
Ruben Brunk [Mon, 5 Nov 2012 23:43:25 +0000 (15:43 -0800)]
am
4bffa066: am
82a7226c: am
85930f99: am
0a32b7af: Fix to ensure visible history adapter strings are from xml.
* commit '
4bffa066f23df50e72bc47a42c61765f3ed9fdc7':
nicolasroard [Mon, 5 Nov 2012 23:43:24 +0000 (15:43 -0800)]
am
8d765a3e: am
2d61ca92: am
cd801412: am
51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
* commit '
8d765a3eaa4f8106d6151f7a86eca293795113f3':
Bobby Georgescu [Mon, 5 Nov 2012 23:43:23 +0000 (15:43 -0800)]
am
f38acfe2: am
8374ab71: am
b96be14e: am
e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
* commit '
f38acfe26732a6fd4f98a6093a52cab32e630f67':
nicolasroard [Mon, 5 Nov 2012 23:43:22 +0000 (15:43 -0800)]
am
40c5b8a3: am
7741a8e0: am
e4614408: am
c778aab1: Prevent unveil direction to change as long as no touch up
* commit '
40c5b8a355f8d347c9ef6f403f93404c27783f99':
nicolasroard [Mon, 5 Nov 2012 23:43:21 +0000 (15:43 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:43:18 +0000 (15:43 -0800)]
am
5ad56e6e: am
4e612a39: am
2f4ec4f1: am
104165f1: Fix several issues with crop/straighten
* commit '
5ad56e6e313a4609780a9d4211088bb306ea3adc':
nicolasroard [Mon, 5 Nov 2012 23:43:14 +0000 (15:43 -0800)]
am
e1afb724: am
1684248c: am
afc8c49f: am
4d276f33: Only translate the main panel if we have to.
* commit '
e1afb724aa158d82aeae744ffa72d78306a6ef01':
nicolasroard [Mon, 5 Nov 2012 23:43:13 +0000 (15:43 -0800)]
am
2b8ef050: am
25c35df0: am
b1b1b8f0: am
267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
* commit '
2b8ef05003876a79189168cbea6460670f0c32fa':
Doris Liu [Mon, 5 Nov 2012 23:43:12 +0000 (15:43 -0800)]
Sascha Haeberling [Mon, 5 Nov 2012 23:43:11 +0000 (15:43 -0800)]
am
2a227625: am
3f8990b6: am
a4c85fc1: am
2f879102: Adds a tiny planet (stereographic projection) image filter.
* commit '
2a227625c785fd769fc0e20f7ac6efeedb4cde92':
John Hoford [Mon, 5 Nov 2012 23:43:10 +0000 (15:43 -0800)]
am
e59ad376: am
172b1b6f: am
e6f7fe76: am
e9c55b28: Add the infrastructure to support Tiny Planet
* commit '
e59ad37603710c3cef5ff47c323234a7c6db64d9':
Bobby Georgescu [Mon, 5 Nov 2012 23:43:08 +0000 (15:43 -0800)]
am
e07079e9: am
c908d79e: am
0def633f: am
41b3cff6: Fix delete and undo behavior on filmstrip
* commit '
e07079e9709ff9cebfe9ef999083d8fb57a91890':
nicolasroard [Mon, 5 Nov 2012 23:43:07 +0000 (15:43 -0800)]
am
2465f514: am
4ff1732d: am
be532361: am
3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches
* commit '
2465f5145625c1156e4e2edb7f0e55e17af87df7':
George Mount [Mon, 5 Nov 2012 23:43:06 +0000 (15:43 -0800)]
am
57e99ca7: am
1b5a21d2: am
6e806709: am
4dd4d80a: Remove progress bar when switching to grid mode.
* commit '
57e99ca7b2e0604b19992dc664c0dbc5ed03aac1':
Bobby Georgescu [Mon, 5 Nov 2012 23:43:04 +0000 (15:43 -0800)]
am
5ec47d54: am
23d7dd46: am
ddb30c54: am
4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches
* commit '
5ec47d5448ba83ae7ee61c34a0d7618c84e76f49':
Mangesh Ghiware [Mon, 5 Nov 2012 23:43:03 +0000 (15:43 -0800)]
Ruben Brunk [Mon, 5 Nov 2012 23:43:02 +0000 (15:43 -0800)]
am
f793b13d: am
c6381a2a: am
91491889: am
b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
f793b13d037e6ef388835b74f415e0361281e8e5':
Bobby Georgescu [Mon, 5 Nov 2012 23:43:01 +0000 (15:43 -0800)]
am
632c127b: am
239bc478: am
5ae82e1e: am
08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
* commit '
632c127be174bbe9474f28f2d0add2e49fdf9208':
Mangesh Ghiware [Mon, 5 Nov 2012 23:42:59 +0000 (15:42 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:42:58 +0000 (15:42 -0800)]
Doris Liu [Mon, 5 Nov 2012 23:42:56 +0000 (15:42 -0800)]
am
c6b5669e: am
a175392c: am
c0ecc707: am
4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
* commit '
c6b5669e5d281871609d110f6e1b4a30af4d6346':
Bobby Georgescu [Mon, 5 Nov 2012 23:42:54 +0000 (15:42 -0800)]
am
1a2b00f0: am
52e44d24: am
51283054: am
b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
* commit '
1a2b00f0460364715cbdcb5765b3fc1bf47ca1c2':
Scott Main [Mon, 5 Nov 2012 23:42:53 +0000 (15:42 -0800)]
am
53f0fa40: am
b07da381: am
44adb1ee: (-s ours) am
9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '
53f0fa4017f99f9ad9a539074c67003734ef0752':
Bobby Georgescu [Mon, 5 Nov 2012 23:42:52 +0000 (15:42 -0800)]
am
625bca8d: am
5fd5a8be: am
856ec7e5: am
79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
* commit '
625bca8d66db8bf5cfeb87598fc14cafbd2bba4e':
John Reck [Mon, 5 Nov 2012 23:42:50 +0000 (15:42 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:42:49 +0000 (15:42 -0800)]
am
7b26a7df: am
1bde451f: am
8f6e1dc3: am
d7899c56: Fix undo/redo/back button behaviour with effects and enable history
* commit '
7b26a7dfc4cb8e236463a9777f03e52209860f29':
George Mount [Mon, 5 Nov 2012 23:42:48 +0000 (15:42 -0800)]
am
1cb1d863: am
39f548a5: am
b69af65f: am
0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
* commit '
1cb1d863456f025e85e56f5b01654a01abd66ee3':
nicolasroard [Mon, 5 Nov 2012 23:42:47 +0000 (15:42 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:42:45 +0000 (15:42 -0800)]
am
1084e8c5: am
a15b5195: am
99679734: am
c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
* commit '
1084e8c5baacf91eff4aa85b59d73d9ccfd993ca':
nicolasroard [Mon, 5 Nov 2012 23:42:44 +0000 (15:42 -0800)]
am
e089d77a: am
5206cc56: am
ff5061c8: am
4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
* commit '
e089d77aa828a4d69ea97c4f185cd4dee0781ae5':
Bobby Georgescu [Mon, 5 Nov 2012 23:42:43 +0000 (15:42 -0800)]
am
d17aac48: am
3234d83c: am
255dad6d: am
0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
* commit '
d17aac48699438d2270ed7e9405b0e0106c7c315':
Sascha Haeberling [Mon, 5 Nov 2012 23:42:42 +0000 (15:42 -0800)]
am
a33c2934: am
8bbc73f4: am
e3106a8c: am
2576a29c: First cut at a skeleton for the TinyPlanets filter.
* commit '
a33c2934e79778d921da2bcb923a4a9f7787c019':
Scott Main [Mon, 5 Nov 2012 23:42:40 +0000 (15:42 -0800)]
am
38cd169c: am
28c4d6bb: am
aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
* commit '
38cd169ca5fab55ae21c400824ce42076816c6e3':
Doris Liu [Mon, 5 Nov 2012 23:42:39 +0000 (15:42 -0800)]
am
72d55ee5: am
d69d5b63: am
7b474a2a: am
08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
* commit '
72d55ee5b46939cc7cd3c3ffc9f6c47cbd64894f':
Ruben Brunk [Mon, 5 Nov 2012 23:42:38 +0000 (15:42 -0800)]
Jason Noguchi [Mon, 5 Nov 2012 23:42:37 +0000 (15:42 -0800)]
am
2e31c132: am
7218147e: am
7ad1b755: am
ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
* commit '
2e31c132db30d0dd23f4ea31e64b86589342a70a':
Baligh Uddin [Mon, 5 Nov 2012 23:42:36 +0000 (15:42 -0800)]
am
d94b8927: am
2709de53: am
ab81203d: (-s ours) am
12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
d94b89274fe65de03bb18da9303bc759bfca55ed':
Baligh Uddin [Mon, 5 Nov 2012 23:42:35 +0000 (15:42 -0800)]
am
0aab175e: am
19460c5e: (-s ours) am
6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
0aab175e66e0ee29128c5c6c86931b65fea7c21b':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:37 +0000 (15:40 -0800)]
am
e7e4f11e: am
34347598: am
1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
* commit '
e7e4f11e28420cc6eb673505e63d57a6467efed3':
Ruben Brunk [Mon, 5 Nov 2012 23:40:36 +0000 (15:40 -0800)]
am
82a7226c: am
85930f99: am
0a32b7af: Fix to ensure visible history adapter strings are from xml.
* commit '
82a7226cd5345c9397302e4951c238d95a5bc35a':
nicolasroard [Mon, 5 Nov 2012 23:40:34 +0000 (15:40 -0800)]
am
2d61ca92: am
cd801412: am
51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
* commit '
2d61ca92facb2120b04f589f6a40e7f15e1b6b06':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:33 +0000 (15:40 -0800)]
am
8374ab71: am
b96be14e: am
e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches
* commit '
8374ab719341ce2a1939ebac5322360f008cedbb':
nicolasroard [Mon, 5 Nov 2012 23:40:31 +0000 (15:40 -0800)]
am
7741a8e0: am
e4614408: am
c778aab1: Prevent unveil direction to change as long as no touch up
* commit '
7741a8e07869d9eb9677fa683f0f913ccd84ecf9':
nicolasroard [Mon, 5 Nov 2012 23:40:30 +0000 (15:40 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:40:28 +0000 (15:40 -0800)]
am
4e612a39: am
2f4ec4f1: am
104165f1: Fix several issues with crop/straighten
* commit '
4e612a39112808a7978e4c0b21a66fba9091d772':
nicolasroard [Mon, 5 Nov 2012 23:40:27 +0000 (15:40 -0800)]
am
1684248c: am
afc8c49f: am
4d276f33: Only translate the main panel if we have to.
* commit '
1684248c622f35ba486be58ba8c49919c194b6b4':
nicolasroard [Mon, 5 Nov 2012 23:40:22 +0000 (15:40 -0800)]
am
25c35df0: am
b1b1b8f0: am
267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
* commit '
25c35df06354db9e6a5ff7cacbfa1d967eecb9c1':
Doris Liu [Mon, 5 Nov 2012 23:40:20 +0000 (15:40 -0800)]
Sascha Haeberling [Mon, 5 Nov 2012 23:40:19 +0000 (15:40 -0800)]
am
3f8990b6: am
a4c85fc1: am
2f879102: Adds a tiny planet (stereographic projection) image filter.
* commit '
3f8990b60d4fb858aecdc0039df26ea11bb5152b':
John Hoford [Mon, 5 Nov 2012 23:40:17 +0000 (15:40 -0800)]
am
172b1b6f: am
e6f7fe76: am
e9c55b28: Add the infrastructure to support Tiny Planet
* commit '
172b1b6f58ef3a727ef2c4ed34cb2e7c0005fe30':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:16 +0000 (15:40 -0800)]
am
c908d79e: am
0def633f: am
41b3cff6: Fix delete and undo behavior on filmstrip
* commit '
c908d79e8a6b4826ba71830fe8f545c57f8942bb':
nicolasroard [Mon, 5 Nov 2012 23:40:14 +0000 (15:40 -0800)]
am
4ff1732d: am
be532361: am
3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches
* commit '
4ff1732d2d0766a139e4a105cfaad6874982ad8a':
George Mount [Mon, 5 Nov 2012 23:40:13 +0000 (15:40 -0800)]
am
1b5a21d2: am
6e806709: am
4dd4d80a: Remove progress bar when switching to grid mode.
* commit '
1b5a21d2286d50f1da3a3df0f40c1144c5778882':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:11 +0000 (15:40 -0800)]
am
23d7dd46: am
ddb30c54: am
4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches
* commit '
23d7dd46aff419f0994840c6a085cc089969b5d7':
Mangesh Ghiware [Mon, 5 Nov 2012 23:40:10 +0000 (15:40 -0800)]
Ruben Brunk [Mon, 5 Nov 2012 23:40:08 +0000 (15:40 -0800)]
am
c6381a2a: am
91491889: am
b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
c6381a2a6ccf0bb7fba7fa44a1e7786c20f709dd':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:07 +0000 (15:40 -0800)]
am
239bc478: am
5ae82e1e: am
08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
* commit '
239bc478a7dfa9343eb8b2547fb54172f50e72aa':
Mangesh Ghiware [Mon, 5 Nov 2012 23:40:05 +0000 (15:40 -0800)]
am
5e1709a2: am
f795b403: am
b037754e: Fix sharing state in Gallery ActionBar
* commit '
5e1709a237e08cf12e0335796ed17ecb24d5a632':
nicolasroard [Mon, 5 Nov 2012 23:40:04 +0000 (15:40 -0800)]
Bobby Georgescu [Mon, 5 Nov 2012 23:40:03 +0000 (15:40 -0800)]
am
f8422e75: am
8cd8a93e: am
cc70347d: am
737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
* commit '
f8422e7526132ee17513dede6403f1aee0227406':
Doris Liu [Mon, 5 Nov 2012 23:40:02 +0000 (15:40 -0800)]
am
a175392c: am
c0ecc707: am
4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
* commit '
a175392c7073819ee6711099d6ce6aa40167b8dd':
Doris Liu [Mon, 5 Nov 2012 23:40:02 +0000 (15:40 -0800)]
am
7f7efb90: am
1febb98e: am
637a7f1b: am
0addfc7f: Save edited picasa to "Edited Online Photos" album
* commit '
7f7efb9080cb6739ec9d27ffee78a29359115132':
Bobby Georgescu [Mon, 5 Nov 2012 23:40:01 +0000 (15:40 -0800)]
am
52e44d24: am
51283054: am
b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches
* commit '
52e44d249893969910b241aded0f9796d5dfa03d':
Ruben Brunk [Mon, 5 Nov 2012 23:40:01 +0000 (15:40 -0800)]
am
d0d21405: am
be7c16de: am
5d596558: am
ef8597fe: Fixed disappearing aspect ratio button.
* commit '
d0d21405f3d317f06afc0f6584a7184482459a73':
Doris Liu [Mon, 5 Nov 2012 23:40:00 +0000 (15:40 -0800)]
am
e78b1def: am
1fd563a6: am
04114762: am
6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches
* commit '
e78b1defccc3f2b2a8d9cd2cbaef0747171c9a1a':
Scott Main [Mon, 5 Nov 2012 23:39:59 +0000 (15:39 -0800)]
am
b07da381: am
44adb1ee: (-s ours) am
9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
* commit '
b07da3812737997ecec4c4a980411b6a8d88caff':
Bobby Georgescu [Mon, 5 Nov 2012 23:39:58 +0000 (15:39 -0800)]
am
5fd5a8be: am
856ec7e5: am
79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
* commit '
5fd5a8be5f387466f2ffc1b89b2356ea2a9bdff1':
Ruben Brunk [Mon, 5 Nov 2012 23:39:58 +0000 (15:39 -0800)]
am
0f7814ae: am
80e62189: am
193c3f0c: am
3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches
* commit '
0f7814ae4c5f53eb365c2707f09845ff2a14561a':
John Hoford [Mon, 5 Nov 2012 23:39:57 +0000 (15:39 -0800)]
am
cb13a19a: am
5acccefe: am
e12e6962: am
da974d84: fix crash from configurable slider ranges
* commit '
cb13a19a6cab25e318508dc6651ddf8c77453776':
John Reck [Mon, 5 Nov 2012 23:39:56 +0000 (15:39 -0800)]
am
d2f8bc06: am
5415b4cb: am
014a111f: Save XMP & Exif data on edited photos
* commit '
d2f8bc069269542936f0e21595081093b86fa474':
Ruben Brunk [Mon, 5 Nov 2012 23:39:56 +0000 (15:39 -0800)]
am
745448f4: am
d0b53c08: am
1056ce1a: am
43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.
* commit '
745448f4683d79c6b06ff9b87054e324a05ec897':
John Hoford [Mon, 5 Nov 2012 23:39:55 +0000 (15:39 -0800)]
am
02b56f9c: am
272546bb: am
abe96287: am
de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches
* commit '
02b56f9c75acd116adac8ec2489360df29b0f551':
nicolasroard [Mon, 5 Nov 2012 23:39:54 +0000 (15:39 -0800)]
am
1bde451f: am
8f6e1dc3: am
d7899c56: Fix undo/redo/back button behaviour with effects and enable history
* commit '
1bde451f817f716c7091b36dc92f714b69c5b363':
nicolasroard [Mon, 5 Nov 2012 23:39:54 +0000 (15:39 -0800)]
am
c5fe04b3: am
8e71835d: am
21c91bfb: am
ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches
* commit '
c5fe04b3ba9621b6a3246e3b5fab12a569db32a1':
George Mount [Mon, 5 Nov 2012 23:39:53 +0000 (15:39 -0800)]
am
39f548a5: am
b69af65f: am
0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
* commit '
39f548a5e9764afa105af687e4db15ed8b7c47cd':
John Reck [Mon, 5 Nov 2012 23:39:53 +0000 (15:39 -0800)]
am
8bb40f38: am
d6d9db90: am
d07026bf: am
57731ee2: Only fade out if texture creation succeeded
* commit '
8bb40f38b3bd152bc246cd42133ebeb56529f920':
Mangesh Ghiware [Mon, 5 Nov 2012 23:39:52 +0000 (15:39 -0800)]
am
38af3351: am
c2c0b1b6: am
07c2c448: am
4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
* commit '
38af335187bb53a746ddabbad801f8c2f6caaa61':
nicolasroard [Mon, 5 Nov 2012 23:39:51 +0000 (15:39 -0800)]
Baligh Uddin [Mon, 5 Nov 2012 23:39:51 +0000 (15:39 -0800)]
am
2e9229ae: am
d0ff9e6b: am
72b0fbef: (-s ours) am
77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
2e9229ae7927e8bea0d5b5a4e5f1a82021ca7c2b':
nicolasroard [Mon, 5 Nov 2012 23:39:50 +0000 (15:39 -0800)]
am
a15b5195: am
99679734: am
c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches
* commit '
a15b51954535b1f2320a577c0a72c676775f4208':
Baligh Uddin [Mon, 5 Nov 2012 23:39:50 +0000 (15:39 -0800)]
am
6e657227: am
f71589e4: (-s ours) am
55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
6e6572275c4b810281fe261545f8c3b48cf73568':
nicolasroard [Mon, 5 Nov 2012 23:39:48 +0000 (15:39 -0800)]
am
5206cc56: am
ff5061c8: am
4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches
* commit '
5206cc568e7b7122a7b7c18ba117d19427ba0671':
Bobby Georgescu [Mon, 5 Nov 2012 23:39:47 +0000 (15:39 -0800)]
am
3234d83c: am
255dad6d: am
0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
* commit '
3234d83c379cd65e626adb84a917bb73cb37c6a1':
Sascha Haeberling [Mon, 5 Nov 2012 23:39:45 +0000 (15:39 -0800)]
am
8bbc73f4: am
e3106a8c: am
2576a29c: First cut at a skeleton for the TinyPlanets filter.
* commit '
8bbc73f4cf2d29e101e9570a11cd1604460f31ac':
Scott Main [Mon, 5 Nov 2012 23:39:43 +0000 (15:39 -0800)]
am
28c4d6bb: am
aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
* commit '
28c4d6bbded4b2702368cc78340e4136d0878525':
Doris Liu [Mon, 5 Nov 2012 23:39:41 +0000 (15:39 -0800)]
am
d69d5b63: am
7b474a2a: am
08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
* commit '
d69d5b639570688122c847898943b1a1bbfa43f0':
Ruben Brunk [Mon, 5 Nov 2012 23:39:39 +0000 (15:39 -0800)]
Jason Noguchi [Mon, 5 Nov 2012 23:39:37 +0000 (15:39 -0800)]
am
7218147e: am
7ad1b755: am
ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
* commit '
7218147e6d81315245e3a485fb954761af687b2f':
Baligh Uddin [Mon, 5 Nov 2012 23:39:35 +0000 (15:39 -0800)]
am
2709de53: am
ab81203d: (-s ours) am
12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
2709de537dd57a1ac329b35fc29a165aa1e2ae16':
Baligh Uddin [Mon, 5 Nov 2012 23:39:34 +0000 (15:39 -0800)]
am
19460c5e: (-s ours) am
6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
19460c5e8d1bfbdb43c0ec32e05a57458e5561ab':
Bobby Georgescu [Mon, 5 Nov 2012 23:38:02 +0000 (15:38 -0800)]
am
8cd8a93e: am
cc70347d: am
737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
* commit '
8cd8a93eae3158f8469026f65e7d31819ae38fab':
Doris Liu [Mon, 5 Nov 2012 23:38:01 +0000 (15:38 -0800)]
am
1febb98e: am
637a7f1b: am
0addfc7f: Save edited picasa to "Edited Online Photos" album
* commit '
1febb98e498f425935cfafdb492283b42ef61c87':
Ruben Brunk [Mon, 5 Nov 2012 23:37:59 +0000 (15:37 -0800)]
am
be7c16de: am
5d596558: am
ef8597fe: Fixed disappearing aspect ratio button.
* commit '
be7c16de9647b449ed417ae16315b47aaa143a83':
Doris Liu [Mon, 5 Nov 2012 23:37:58 +0000 (15:37 -0800)]
am
1fd563a6: am
04114762: am
6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches
* commit '
1fd563a6bc183f573f7f44de5aaa55a4fbc1dbb7':
Ruben Brunk [Mon, 5 Nov 2012 23:37:56 +0000 (15:37 -0800)]
am
80e62189: am
193c3f0c: am
3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches
* commit '
80e6218918b508f6147c8cc9699df8d338e50a95':
John Hoford [Mon, 5 Nov 2012 23:37:54 +0000 (15:37 -0800)]
am
5acccefe: am
e12e6962: am
da974d84: fix crash from configurable slider ranges
* commit '
5acccefeadeff7ff09683b165ac1516d733bf75b':
Ruben Brunk [Mon, 5 Nov 2012 23:37:53 +0000 (15:37 -0800)]
am
d0b53c08: am
1056ce1a: am
43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things.
* commit '
d0b53c08d88a696170989d6c0c72f8cbb26ac654':
John Hoford [Mon, 5 Nov 2012 23:37:51 +0000 (15:37 -0800)]
am
272546bb: am
abe96287: am
de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches
* commit '
272546bbbfa29cc0fd273003a071e735631a4766':
nicolasroard [Mon, 5 Nov 2012 23:37:50 +0000 (15:37 -0800)]
am
8e71835d: am
21c91bfb: am
ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches
* commit '
8e71835d2d34e33a1622fbf66308fc0ccfc6f876':