OSDN Git Service
Teng-Hui Zhu [Mon, 5 Nov 2012 23:49:37 +0000 (15:49 -0800)]
am
0a82481b: am
5122c99a: am
ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches
* commit '
0a82481b7375efcbf07e677e2682be166d58a001':
nicolasroard [Mon, 5 Nov 2012 23:49:36 +0000 (15:49 -0800)]
Bobby Georgescu [Mon, 5 Nov 2012 23:49:34 +0000 (15:49 -0800)]
am
f254567f: am
baffd018: am
86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
* commit '
f254567f344826e3398a645cd0c87012653d184f':
John Reck [Mon, 5 Nov 2012 23:49:33 +0000 (15:49 -0800)]
Bobby Georgescu [Mon, 5 Nov 2012 23:49:32 +0000 (15:49 -0800)]
am
a8227bbe: am
f77721af: am
5bd00332: Launch built-in camera app via filmstrip
* commit '
a8227bbee10f8aabff550c4baca09247985ca775':
Ruben Brunk [Mon, 5 Nov 2012 23:49:30 +0000 (15:49 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:49:29 +0000 (15:49 -0800)]
am
fbe416ad: am
2281b682: am
ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
* commit '
fbe416ada2674df7c5488b693d88602da0d761c2':
John Hoford [Mon, 5 Nov 2012 23:49:27 +0000 (15:49 -0800)]
am
9da23648: am
0b8c1459: am
de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches
* commit '
9da23648df344bd4bcc3d4ce8243936e5353aaf3':
Bobby Georgescu [Mon, 5 Nov 2012 23:49:26 +0000 (15:49 -0800)]
am
624ad6d0: am
a0d84367: am
a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
* commit '
624ad6d08fc12169a1cbdd2013496de93fdb72c7':
Baligh Uddin [Mon, 5 Nov 2012 23:49:25 +0000 (15:49 -0800)]
am
5b41962e: am
b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
5b41962e717d65f6b4db37300ca274fd62c6df91':
Baligh Uddin [Mon, 5 Nov 2012 23:49:23 +0000 (15:49 -0800)]
am
5c9c8ac3: am
5116f2fd: (-s ours) am
a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
5c9c8ac303db6f29abae6b3180a1d377d71e66fa':
Bobby Georgescu [Mon, 5 Nov 2012 23:49:22 +0000 (15:49 -0800)]
am
03470f4c: am
51881e02: am
f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
* commit '
03470f4ce6b931cdf0a388f6b5174f3f53afa9a0':
Owen Lin [Mon, 5 Nov 2012 23:49:21 +0000 (15:49 -0800)]
Sascha Haeberling [Mon, 5 Nov 2012 23:49:20 +0000 (15:49 -0800)]
am
a03998c9: am
b682706f: am
c60752b2: Use XMP meta-data for correct tiny planets.
* commit '
a03998c9adb9a0b53696d64c666fc7e39fa7292d':
Ruben Brunk [Mon, 5 Nov 2012 23:49:18 +0000 (15:49 -0800)]
am
b004a6f9: am
1d866031: am
eb75699b: Fixed scaling factor for ImageShow and rotations.
* commit '
b004a6f93a883887b73e98fd5191689f9890290e':
Ruben Brunk [Mon, 5 Nov 2012 23:49:17 +0000 (15:49 -0800)]
am
f60139ce: am
5a093c66: am
3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches
* commit '
f60139cee9f3db343e378547b27dfb68377a486d':
Nicolas Roard [Mon, 5 Nov 2012 23:49:16 +0000 (15:49 -0800)]
am
c0c5c138: am
842257ca: am
d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
* commit '
c0c5c138068a8d5b0b5db2c7583f0bcf5074be71':
Doris Liu [Mon, 5 Nov 2012 23:49:14 +0000 (15:49 -0800)]
am
c3d2b085: am
413c7109: am
5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
* commit '
c3d2b085294e28adf3f41e2e26b3261415ce8f85':
Ruben Brunk [Mon, 5 Nov 2012 23:49:13 +0000 (15:49 -0800)]
am
d8ddd8d8: am
c3a48597: am
f46da69a: Increased touch tolerance in cropping.
* commit '
d8ddd8d841da84973f451e2aca7a4f871b2861ca':
Baligh Uddin [Mon, 5 Nov 2012 23:49:12 +0000 (15:49 -0800)]
am
e1036a50: Import translations. DO NOT MERGE
* commit '
e1036a509ec62c1d9146ca72e3a39313d0310a2d':
Import translations. DO NOT MERGE
Ruben Brunk [Mon, 5 Nov 2012 23:49:10 +0000 (15:49 -0800)]
John Hoford [Mon, 5 Nov 2012 23:49:09 +0000 (15:49 -0800)]
am
ea4097c9: am
4b2c4ecb: am
67fefdb9: add support for black and white filters, add rotation API to tiny planet
* commit '
ea4097c9ac4f3b56c065eaaf8b72bc0ee3743b0f':
Bobby Georgescu [Mon, 5 Nov 2012 23:49:08 +0000 (15:49 -0800)]
am
beda88a7: am
c67bc34b: am
a850a543: Fix jank when launching editor from Camera filmstrip
* commit '
beda88a7038e82565011c26804940f25f3fd789a':
nicolasroard [Mon, 5 Nov 2012 23:49:06 +0000 (15:49 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:49:05 +0000 (15:49 -0800)]
am
808a5869: am
a482d850: am
cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches
* commit '
808a5869a56f8a3671f7c80c319dff6b94ea7915':
John Reck [Mon, 5 Nov 2012 23:49:03 +0000 (15:49 -0800)]
am
590acf86: am
94fa0565: am
d6453edc: Merge "Fix NPE" into gb-ub-photos-arches
* commit '
590acf8681c11395e9b9548e4cd8a205902cbb35':
George Mount [Mon, 5 Nov 2012 23:48:59 +0000 (15:48 -0800)]
am
0827ebf0: am
71647c7a: am
7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
* commit '
0827ebf079934ae9e6cb7285e785a1a179f155fa':
nicolasroard [Mon, 5 Nov 2012 23:48:56 +0000 (15:48 -0800)]
am
30fd4b42: am
bd4ea013: am
ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches
* commit '
30fd4b427eb84d553dfcae3759707f9d8da75001':
Sascha Haeberling [Mon, 5 Nov 2012 23:48:55 +0000 (15:48 -0800)]
am
22fae182: am
25d08e2b: am
a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
* commit '
22fae1820b13017c121879774b0afd522ecee676':
nicolasroard [Mon, 5 Nov 2012 23:48:54 +0000 (15:48 -0800)]
am
05757033: am
bc9d4ccc: am
5d7e98f7: Fix another potential crash in Curves
* commit '
05757033049bd84e44f695ca781889d44577c589':
nicolasroard [Mon, 5 Nov 2012 23:48:52 +0000 (15:48 -0800)]
am
4626ebd1: am
0b44017c: am
361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
* commit '
4626ebd1e289777868f33abb5e0b3a4bc116961e':
Bobby Georgescu [Mon, 5 Nov 2012 23:48:51 +0000 (15:48 -0800)]
am
75a448eb: am
f30096b4: am
c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
* commit '
75a448eb193308f6b9268968265895c019ae3ab2':
nicolasroard [Mon, 5 Nov 2012 23:48:50 +0000 (15:48 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:48:48 +0000 (15:48 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:48:47 +0000 (15:48 -0800)]
am
cd35c2fc: am
488547b0: am
2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
* commit '
cd35c2fc673f455de2d5853ecf1248d8ff167742':
George Mount [Mon, 5 Nov 2012 23:48:46 +0000 (15:48 -0800)]
am
b2fb154f: am
3bfbae1d: am
24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
* commit '
b2fb154fa84ec663bb8e181c299a3868e9ee98aa':
Baligh Uddin [Mon, 5 Nov 2012 23:48:44 +0000 (15:48 -0800)]
am
0f40db8d: am
306176fb: (-s ours) am
7c08064b: (-s ours) Import translations. DO NOT MERGE
* commit '
0f40db8d736ab95f0a3c9b03c9b20f5bd85a34f1':
Baligh Uddin [Mon, 5 Nov 2012 23:48:43 +0000 (15:48 -0800)]
am
e6319953: am
caace51d: (-s ours) Import translations. DO NOT MERGE
* commit '
e6319953a3b2d11251b57bfb6cd2a5e0ffbb552d':
Baligh Uddin [Mon, 5 Nov 2012 23:48:41 +0000 (15:48 -0800)]
am
69cec707: (-s ours) Import translations. DO NOT MERGE
* commit '
69cec707836ae8c072da9e0015160b96a5c5c6be':
Import translations. DO NOT MERGE
John Hoford [Mon, 5 Nov 2012 23:45:00 +0000 (15:45 -0800)]
am
57900769: am
ea7366a5: am
5fbfe6f1: on entry check if Tiny Planet if not remove UI
* commit '
5790076999dfcd7d8cadb7ce616968a4954a5cc4':
Mangesh Ghiware [Mon, 5 Nov 2012 23:44:58 +0000 (15:44 -0800)]
am
f7c1c580: am
4a138a84: am
63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches
* commit '
f7c1c580996c0fd874811871b9ca202cb191b674':
Bobby Georgescu [Mon, 5 Nov 2012 23:44:56 +0000 (15:44 -0800)]
am
6377a7e8: am
0df51da9: am
afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches
* commit '
6377a7e8d36a60e0fe5be9854f0112ab5b654e01':
Doris Liu [Mon, 5 Nov 2012 23:44:55 +0000 (15:44 -0800)]
am
574be81d: am
7ad3eb28: am
3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
* commit '
574be81d8b20df74f827bb4a1fba9b969a251102':
Hung-ying Tyan [Mon, 5 Nov 2012 23:44:53 +0000 (15:44 -0800)]
am
c09daea1: am
23cfddb4: am
bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
* commit '
c09daea126a7f1d609908883958963a99d86e896':
John Reck [Mon, 5 Nov 2012 23:44:51 +0000 (15:44 -0800)]
am
38d29567: am
fdfced2d: am
ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
* commit '
38d295679f6f81313d1e2ec8d4f765255467f267':
Bobby Georgescu [Mon, 5 Nov 2012 23:44:50 +0000 (15:44 -0800)]
am
20a91815: am
b21c127c: am
e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
* commit '
20a91815828f7f0a98eb4b577eb9c618b870b1d0':
Ruben Brunk [Mon, 5 Nov 2012 23:44:48 +0000 (15:44 -0800)]
am
6d9a6ff8: am
91814c2e: am
168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
* commit '
6d9a6ff8ed24be732f98cb83180f951e871f98dd':
Baligh Uddin [Mon, 5 Nov 2012 23:44:46 +0000 (15:44 -0800)]
am
b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
b2993d29a712533610d7c4b39b31ad74f0d76c68':
Import translations. DO NOT MERGE
Bobby Georgescu [Mon, 5 Nov 2012 23:43:11 +0000 (15:43 -0800)]
am
1b73272f: am
cfbbe15d: am
3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
* commit '
1b73272f029c89541ad5e230865b50bf4532876a':
George Mount [Mon, 5 Nov 2012 23:43:10 +0000 (15:43 -0800)]
am
d5d4246f: am
f2272574: am
58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
* commit '
d5d4246ffcbdfdf491846b1a314fb59064e2f4b4':
Baligh Uddin [Mon, 5 Nov 2012 23:43:08 +0000 (15:43 -0800)]
am
541b5568: am
1d25a687: (-s ours) am
73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
541b5568552c09077b562a284c3b7d24549b2ea2':
Baligh Uddin [Mon, 5 Nov 2012 23:43:07 +0000 (15:43 -0800)]
am
e2dd5119: (-s ours) am
2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
e2dd511925056b11ab12b782e9e80a6a4038f042':
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)]
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':
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':
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':
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':
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':
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':
nicolasroard [Mon, 5 Nov 2012 23:39:51 +0000 (15:39 -0800)]
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':
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':