OSDN Git Service
Baligh Uddin [Mon, 5 Nov 2012 23:57:00 +0000 (15:57 -0800)]
am
2bd00f79: am
115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2bd00f793ffe9d20ec117515812cc4e534a5d876':
Baligh Uddin [Mon, 5 Nov 2012 23:56:59 +0000 (15:56 -0800)]
am
06e7810c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
06e7810cb3467ef99623826d662d18cc5ae64330':
Import translations. DO NOT MERGE
nicolasroard [Mon, 5 Nov 2012 23:54:28 +0000 (15:54 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:54:27 +0000 (15:54 -0800)]
am
2147266d: am
ddc54044: am
98990049: Merge "Fix zooming position" into gb-ub-photos-arches
* commit '
2147266dc65bd95d5603c53fe23e77e136fa68f4':
John Hoford [Mon, 5 Nov 2012 23:54:26 +0000 (15:54 -0800)]
am
6f444bb4: am
031a0741: am
17540e58: Do not copy XMP data if it has TinyPlanet filter
* commit '
6f444bb46565e5f3142c16c2a3f7ebcdcafd90cd':
Baligh Uddin [Mon, 5 Nov 2012 23:54:24 +0000 (15:54 -0800)]
am
cbf27c96: am
fbab7ba5: (-s ours) am
49af06e2: (-s ours) Import translations. DO NOT MERGE
* commit '
cbf27c9661d34b9f334af225bee356f29ad4aa17':
Baligh Uddin [Mon, 5 Nov 2012 23:54:23 +0000 (15:54 -0800)]
am
3540bf03: am
b3e89cab: (-s ours) Import translations. DO NOT MERGE
* commit '
3540bf03ffea7b52fe43c9029e3a07f0b3cd09a2':
Baligh Uddin [Mon, 5 Nov 2012 23:54:22 +0000 (15:54 -0800)]
am
68983489: (-s ours) Import translations. DO NOT MERGE
* commit '
68983489dbd8310e25339b1a7988c6ba167a3795':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 23:51:51 +0000 (15:51 -0800)]
am
4ecaa689: am
5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
4ecaa6890d0be8018d8c85c6590e81601e31312b':
Baligh Uddin [Mon, 5 Nov 2012 23:51:50 +0000 (15:51 -0800)]
am
ebe62dc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
ebe62dc682db5b6e1fc52c5288d74642e742aa5a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 23:50:20 +0000 (15:50 -0800)]
am
fc8e6db7: am
10f64ff1: (-s ours) am
798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
fc8e6db700cadfe0ad19fb783014428877bd2b6d':
Baligh Uddin [Mon, 5 Nov 2012 23:50:18 +0000 (15:50 -0800)]
am
f2f31a63: am
8275abe7: (-s ours) am
5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
f2f31a63fbcb97da3ba7140ab4689b5d90bdda84':
Baligh Uddin [Mon, 5 Nov 2012 23:50:17 +0000 (15:50 -0800)]
am
adfcb006: am
1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
adfcb00669bee5797c93ca163adb40f282ec5e9b':
Baligh Uddin [Mon, 5 Nov 2012 23:50:15 +0000 (15:50 -0800)]
am
6d9d8e3d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
6d9d8e3d01d9ce852fd069d453850f78bda0b525':
Import translations. DO NOT MERGE
nicolasroard [Mon, 5 Nov 2012 23:50:14 +0000 (15:50 -0800)]
am
c2931f8e: am
33d33c7e: am
2d2b69b0: Fix rounding issue affecting TinyPlanet
* commit '
c2931f8e2495c038173045de750959f8012bfc93':
Nicolas Roard [Mon, 5 Nov 2012 23:50:12 +0000 (15:50 -0800)]
am
92503c9e: am
90af32fb: am
a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
* commit '
92503c9e00e1fcf097a1c960eb74d4b9e1499252':
Nicolas Roard [Mon, 5 Nov 2012 23:50:11 +0000 (15:50 -0800)]
am
e5ac5d03: am
d2a1f33f: am
26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
* commit '
e5ac5d036935e0024273bc6875c2cfb57107171c':
Doris Liu [Mon, 5 Nov 2012 23:50:10 +0000 (15:50 -0800)]
am
4fc2db3c: am
f245d2b7: am
591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
* commit '
4fc2db3c010f821c7c1065ed31135c83e6d4f195':
George Mount [Mon, 5 Nov 2012 23:50:09 +0000 (15:50 -0800)]
am
9f039e39: am
6027d763: am
b6d49492: Remove black borders in Manta LightCycle capture after orientation change.
* commit '
9f039e395d80fcd14d7bfdb0b303a39baa5fa8c7':
Bobby Georgescu [Mon, 5 Nov 2012 23:50:08 +0000 (15:50 -0800)]
am
f1a99b9f: am
2c8a2468: am
88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
* commit '
f1a99b9f0dc504b6517c17a5a203a7d3c3c75834':
John Reck [Mon, 5 Nov 2012 23:50:07 +0000 (15:50 -0800)]
am
f1d6566a: am
38e64b25: am
10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches
* commit '
f1d6566a2df59e6c1402f95dab3cb51069aa880b':
Bobby Georgescu [Mon, 5 Nov 2012 23:50:05 +0000 (15:50 -0800)]
am
ef9cf18c: am
d58b942a: am
798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
* commit '
ef9cf18c436df3c18989f53c0e2bb14b87ecb487':
nicolasroard [Mon, 5 Nov 2012 23:50:04 +0000 (15:50 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:50:03 +0000 (15:50 -0800)]
am
c11b4c85: am
7dcaeec6: am
8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches
* commit '
c11b4c85f80b24a0e9af089cfd96bd2af1bdf108':
Hung-ying Tyan [Mon, 5 Nov 2012 23:50:02 +0000 (15:50 -0800)]
am
aad5aa69: am
45dfd43e: am
635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
* commit '
aad5aa69f8393ba1ca3a010afbe554ac84efbf79':
Nicolas Roard [Mon, 5 Nov 2012 23:50:00 +0000 (15:50 -0800)]
am
69664062: am
78497220: am
24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
* commit '
69664062bc9039a0d548a7666680a852db947c33':
John Reck [Mon, 5 Nov 2012 23:49:59 +0000 (15:49 -0800)]
am
62b46051: am
c62b066a: am
6106c833: Merge "Add loading spinner" into gb-ub-photos-arches
* commit '
62b46051d75cc323332eeb4c0c79e3895647cb5a':
Mangesh Ghiware [Mon, 5 Nov 2012 23:49:58 +0000 (15:49 -0800)]
am
485797d7: am
dd7139ba: am
5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
* commit '
485797d7aec85f3ddf990522ee8c55a04a2c95ab':
Ruben Brunk [Mon, 5 Nov 2012 23:49:57 +0000 (15:49 -0800)]
am
348b64a0: am
bdd21912: am
4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches
* commit '
348b64a0414a1c8143e1997fe44efd4ac91a8665':
Ruben Brunk [Mon, 5 Nov 2012 23:49:56 +0000 (15:49 -0800)]
am
eee46d78: am
812d65bd: am
d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches
* commit '
eee46d78ba7231db50e096b1b4acff2f3937b3c4':
Ruben Brunk [Mon, 5 Nov 2012 23:49:54 +0000 (15:49 -0800)]
am
dc87b334: am
1ff4d0fd: am
15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
* commit '
dc87b334fe834fab09c8a220500b9c1683561543':
Michael Jurka [Mon, 5 Nov 2012 23:49:53 +0000 (15:49 -0800)]
am
b83e3632: am
f38cb998: Fix conflict with other build fix
* commit '
b83e3632acf59c2e790f6d22f7830891db44852b':
Bobby Georgescu [Mon, 5 Nov 2012 23:49:52 +0000 (15:49 -0800)]
am
8ee82082: am
d43a8f94: am
6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
* commit '
8ee820827f9087dec7e82cdf75976330a62bbd06':
Michael Jurka [Mon, 5 Nov 2012 23:49:51 +0000 (15:49 -0800)]
am
559d76f9: am
a31708cf: am
0c7e8aac: Merge "Fix build." into gb-ub-photos-arches
* commit '
559d76f993af7a72a077427af87eb1dc655b6540':
Michael Jurka [Mon, 5 Nov 2012 23:49:50 +0000 (15:49 -0800)]
am
1c4fafe9: am
17c550d3: Merge "Fix build" into jb-mr1-dev
* commit '
1c4fafe902ef9b527abab4be992dcf253efc1701':
nicolasroard [Mon, 5 Nov 2012 23:49:48 +0000 (15:49 -0800)]
am
9f4d5f1b: am
a36cc0eb: am
8bc296e2: Fix crash when starting filtereditor
* commit '
9f4d5f1ba9f395092709f042cf6967c05c679c25':
Angus Kong [Mon, 5 Nov 2012 23:49:47 +0000 (15:49 -0800)]
am
9b12b990: am
c6b77275: am
71c17775: Force renderring request for Camera Animation.
* commit '
9b12b990cd9262dfc15c274e66681531352315e2':
nicolasroard [Mon, 5 Nov 2012 23:49:46 +0000 (15:49 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:49:45 +0000 (15:49 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:49:43 +0000 (15:49 -0800)]
am
d491af09: am
d4c93190: am
ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches
* commit '
d491af093d8614e33b89bccaa1db030128eaaa25':
Sascha Haeberling [Mon, 5 Nov 2012 23:49:42 +0000 (15:49 -0800)]
am
fb494479: am
2df8a18a: am
b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
* commit '
fb49447912a3acf5bbadcfcb696a282b6765b05f':
Ruben Brunk [Mon, 5 Nov 2012 23:49:41 +0000 (15:49 -0800)]
am
a9bc6deb: am
e1de865c: am
4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
* commit '
a9bc6deb8e4eb9e57b13d83a33251e62d6a87e01':
nicolasroard [Mon, 5 Nov 2012 23:49:39 +0000 (15:49 -0800)]
nicolasroard [Mon, 5 Nov 2012 23:49:38 +0000 (15:49 -0800)]
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':