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

Tenghui Zhu [Tue, 6 Nov 2012 00:02:18 +0000 (16:02 -0800)]

am de40420c: (-s ours) am 50d82151: am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

* commit 'de40420c1c0d3a134a9544a2270e27a4933e5b21':

commit | commitdiff | tree

Bart Sears [Tue, 6 Nov 2012 00:02:17 +0000 (16:02 -0800)]

am f8981654: am df8605ba: am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit 'f8981654575b21ee7eaf153b2078db1300fdeb72':

commit | commitdiff | tree

George Mount [Tue, 6 Nov 2012 00:02:16 +0000 (16:02 -0800)]

am 664c3221: am d96fb3ee: am 59e23832: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches

* commit '664c322186f583555c906c67ccab9773ac859d5d':

commit | commitdiff | tree

Baligh Uddin [Tue, 6 Nov 2012 00:02:15 +0000 (16:02 -0800)]

am ee0939a9: (-s ours) am 4eb23cf3: am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'ee0939a9f17404553c1f37a9e3ec46beac8d63d4':

commit | commitdiff | tree

Baligh Uddin [Tue, 6 Nov 2012 00:02:13 +0000 (16:02 -0800)]

am 4ff31443: (-s ours) am 1ed82061: am 2bd00f79: am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '4ff31443a10bc98331d18ce63ad11a1ba3100771':

commit | commitdiff | tree

Baligh Uddin [Tue, 6 Nov 2012 00:02:12 +0000 (16:02 -0800)]

am 1d343402: (-s ours) am cfaea9f2: am 06e7810c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '1d34340229ada80370719e9bf3b9884dd50bd18d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:59:41 +0000 (15:59 -0800)]

am d52ad089: am abfa44cd: am ded6d0fe: am b3e7d7d8: am dc03ae14: Reset rotation flag

* commit 'd52ad08995bdfa48d42963c964951fe6f09e367f':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:59:40 +0000 (15:59 -0800)]

am d42bbc89: am 61529fbc: am 2147266d: am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches

* commit 'd42bbc8971c6e7ca471215c08fe5b31a54618bad':

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:59:39 +0000 (15:59 -0800)]

am 000ce789: am 1d4ef504: am 6f444bb4: am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter

* commit '000ce78987d83d2fbe33d511fcbfde6b6bf7e0a1':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:59:38 +0000 (15:59 -0800)]

am 57018796: (-s ours) am 73e7d153: am cbf27c96: am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE

* commit '5701879609f4d7f7d05d0c92b50d9b691047f16d':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:59:37 +0000 (15:59 -0800)]

am 4ebd694a: (-s ours) am 783e171c: am 3540bf03: am b3e89cab: (-s ours) Import translations. DO NOT MERGE

* commit '4ebd694ac48590dc0d23b7dea563302a540a7ef0':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:59:35 +0000 (15:59 -0800)]

am 36efb7b4: (-s ours) am bddbc50f: am 68983489: (-s ours) Import translations. DO NOT MERGE

* commit '36efb7b4e6a31be467b2410f130cebfca49ed7a2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:59:33 +0000 (15:59 -0800)]

am 91e9ae50: (-s ours) am 039e80be: am 4ecaa689: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '91e9ae50ece01f7489f9ca20bc5373041d46ddd0':

commit | commitdiff | tree

Tenghui Zhu [Mon, 5 Nov 2012 23:59:31 +0000 (15:59 -0800)]

am 50d82151: am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

* commit '50d8215190ced5537ef477b2721cfde053cb1848':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:59:31 +0000 (15:59 -0800)]

am 119173c7: (-s ours) am caf70588: am ebe62dc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '119173c74b61bd90203060a81468499c3a89bd54':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Bart Sears [Mon, 5 Nov 2012 23:59:30 +0000 (15:59 -0800)]

am df8605ba: am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit 'df8605ba6ca8a3501b141f7f41ecaabc1b3a8c2b':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:59:29 +0000 (15:59 -0800)]

am d96fb3ee: am 59e23832: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches

* commit 'd96fb3ee6a0c993e719798b368986cb68a93ceb2':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:59:28 +0000 (15:59 -0800)]

am 4eb23cf3: am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '4eb23cf3f3d1a4120d717dca126d70ff15c3bde2':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:59:27 +0000 (15:59 -0800)]

am 1ed82061: am 2bd00f79: am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '1ed8206143ab7e60e5b3c92cc434562797e116fe':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:59:24 +0000 (15:59 -0800)]

am cfaea9f2: am 06e7810c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

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

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:58:01 +0000 (15:58 -0800)]

am 99190c78: (-s ours) am 16f8aa84: am fc8e6db7: am 10f64ff1: (-s ours) am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '99190c78fa45ad42de2d0d2604bda94ab09565eb':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:57:59 +0000 (15:57 -0800)]

am 2d4bdb52: (-s ours) am 82d5861e: am f2f31a63: am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '2d4bdb522769183b606d688b975555a52eb44140':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:57:58 +0000 (15:57 -0800)]

am 2ede7f35: (-s ours) am ed035ad1: am adfcb006: am 1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2ede7f35a5452deb5e2b9689c3e48313cfcece9b':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:57:54 +0000 (15:57 -0800)]

am e6405a05: (-s ours) am 1dbf0ed9: am 6d9d8e3d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

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

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:52 +0000 (15:57 -0800)]

am 96347d0f: am 10d9ad75: am c2931f8e: am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet

* commit '96347d0fb655d53b7ba9002e4da7a67825cce869':

commit | commitdiff | tree

Nicolas Roard [Mon, 5 Nov 2012 23:57:51 +0000 (15:57 -0800)]

am 3a1d144e: am ef70f937: am 92503c9e: am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches

* commit '3a1d144ec03d3ae2bf43a5e2883de01788405d97':

commit | commitdiff | tree

Nicolas Roard [Mon, 5 Nov 2012 23:57:50 +0000 (15:57 -0800)]

am 747ba385: am 538d47a8: am e5ac5d03: am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches

* commit '747ba385b81c0d9cbf55c6976f85a68a116163be':

commit | commitdiff | tree

Doris Liu [Mon, 5 Nov 2012 23:57:49 +0000 (15:57 -0800)]

am 2601ba4e: am 6ffd2096: am 4fc2db3c: am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches

* commit '2601ba4e2b951e450b82272f8001724a77facb12':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:57:46 +0000 (15:57 -0800)]

am 9b670c72: am 9041daac: am 9f039e39: am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change.

* commit '9b670c7273823796a6ed88201bd09e4591b37652':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:57:42 +0000 (15:57 -0800)]

am 89353d20: am 01b92c5f: am f1a99b9f: am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches

* commit '89353d20c286647a7858f0b583a0d8a94d50656a':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:57:41 +0000 (15:57 -0800)]

am 60894b84: am 8bab921b: am f1d6566a: am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches

* commit '60894b844aa5d71abc48844bc2bc8c109d7ec5b3':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:57:40 +0000 (15:57 -0800)]

am cd87f4ec: am 49f0a0a9: am ef9cf18c: am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches

* commit 'cd87f4ec842503547156730c7d6c928958baae45':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:39 +0000 (15:57 -0800)]

am c861a822: am 46d65dc0: am 149b5167: am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror

* commit 'c861a8222485b03521fcdc26f13f672d8d19c2d0':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:37 +0000 (15:57 -0800)]

am b2de0d70: am 891ff2db: am c11b4c85: am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches

* commit 'b2de0d70c46a07ff7f506374646b6aaf3316f310':

commit | commitdiff | tree

Hung-ying Tyan [Mon, 5 Nov 2012 23:57:36 +0000 (15:57 -0800)]

am 0c213fd3: am e31b12f1: am aad5aa69: am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches

* commit '0c213fd3ddc2ed0f6b016877fcc4c1fadc418181':

commit | commitdiff | tree

Nicolas Roard [Mon, 5 Nov 2012 23:57:35 +0000 (15:57 -0800)]

am a5de519f: am 86d47b9a: am 69664062: am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches

* commit 'a5de519f32fb3e4ccd057218bb89a36bbbfe85c7':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:57:34 +0000 (15:57 -0800)]

am 5580d9fa: am f065bbbc: am 62b46051: am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches

* commit '5580d9fac531c6224905e2bc8165fd0eff68d01c':

commit | commitdiff | tree

Mangesh Ghiware [Mon, 5 Nov 2012 23:57:33 +0000 (15:57 -0800)]

am 2d594ca7: am 874d36e4: am 485797d7: am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches

* commit '2d594ca71ad00458ccfa24ed24a4a1ea6863314b':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:57:31 +0000 (15:57 -0800)]

am 34b83236: am a1f8faeb: am 348b64a0: am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches

* commit '34b83236102f503f826c87f520aa299a4fdb71e2':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:57:30 +0000 (15:57 -0800)]

am c372f073: am 2f5fceb7: am eee46d78: am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches

* commit 'c372f073623a3bf6ce8e81e04a056aca625db712':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:57:29 +0000 (15:57 -0800)]

am 7240851a: am 28f3fb0f: am dc87b334: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches

* commit '7240851ab5359ea8d6a877e7550ae71911766e8d':

commit | commitdiff | tree

Michael Jurka [Mon, 5 Nov 2012 23:57:28 +0000 (15:57 -0800)]

am 3d64be40: am f96ce7f1: am b83e3632: am f38cb998: Fix conflict with other build fix

* commit '3d64be40f66ba60bf51bbd0aee2826f075d4fe04':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:57:27 +0000 (15:57 -0800)]

am b92c58c4: am 4554d9f5: am 8ee82082: am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches

* commit 'b92c58c47b5d47d75356b68194bd2317b04b6541':

commit | commitdiff | tree

Michael Jurka [Mon, 5 Nov 2012 23:57:25 +0000 (15:57 -0800)]

am d50f0660: am 645a8682: am 559d76f9: am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches

* commit 'd50f0660fde441344fe4477f92655ff8b792f86e':

commit | commitdiff | tree

Michael Jurka [Mon, 5 Nov 2012 23:57:24 +0000 (15:57 -0800)]

am 4337e14e: am 12aa029d: am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev

* commit '4337e14e56db00c0454c32a9551d479bb7836888':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:23 +0000 (15:57 -0800)]

am 35a20e5e: am 56edac84: am 9f4d5f1b: am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor

* commit '35a20e5e8bd7bd083e674ac4b4652e19f7e4819e':

commit | commitdiff | tree

Angus Kong [Mon, 5 Nov 2012 23:57:22 +0000 (15:57 -0800)]

am dfc81934: am 659fd380: am 9b12b990: am c6b77275: am 71c17775: Force renderring request for Camera Animation.

* commit 'dfc819349d80f7e3470508a1f8242eeadf511cf6':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:20 +0000 (15:57 -0800)]

am 1d092cb3: am 3f622aae: am 9ed11664: am dff8cf82: am dffe6a6f: Fix default for tiny planet

* commit '1d092cb3bdb9976ea4e8c03898acb0b07d8d10fd':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:19 +0000 (15:57 -0800)]

am 0d1c386a: am 11d32976: am e3642a33: am 73a2ad06: am e7a71372: Fix update view

* commit '0d1c386aa3b46cc878587515436a6fad15fe2b30':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:18 +0000 (15:57 -0800)]

am e439e8cd: am ef6d3c66: am d491af09: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches

* commit 'e439e8cdd005aea361e5b2077fc0f60475ee6a96':

commit | commitdiff | tree

Sascha Haeberling [Mon, 5 Nov 2012 23:57:16 +0000 (15:57 -0800)]

am 37a623ce: am f7b7880d: am fb494479: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches

* commit '37a623ce5444309ebc0e9b33b28c39c97d30e7be':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:57:15 +0000 (15:57 -0800)]

am 8487a981: am ebcccd9f: am a9bc6deb: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches

* commit '8487a981e63c769e8dea83bd70555be09010ac60':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:14 +0000 (15:57 -0800)]

am fc7014b4: am 73331693: am c6b4ecf6: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view

* commit 'fc7014b4cc4e5d8ffcc045a8d8eb4f65ef755395':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:13 +0000 (15:57 -0800)]

am b6d472d0: am 61124cb3: am e8df5a6d: am 6bedee87: am 7592704e: Fixes UI stuff

* commit 'b6d472d081e5d3e3a6dc84e732b0f91256642a32':

commit | commitdiff | tree

Teng-Hui Zhu [Mon, 5 Nov 2012 23:57:12 +0000 (15:57 -0800)]

am 61a0b247: am 001cef5c: am 0a82481b: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches

* commit '61a0b24722189927b8788136a3a0ef65ce53f804':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:10 +0000 (15:57 -0800)]

am 592a13f8: am 4fe1c262: am a19301bb: am 6cea6759: am 0a23b42e: Change background and panel colors

* commit '592a13f809b5bd21f2419e5d89e6614f18974734':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:57:09 +0000 (15:57 -0800)]

am 7c3db8d2: am ab923576: am f254567f: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches

* commit '7c3db8d2be57ead88eb52d50ec64d8f845e28417':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:57:08 +0000 (15:57 -0800)]

am 1be2de88: am 46aff56a: am d2173fc8: am 1376c4dc: am d49d5320: Move loadBitmap to async task

* commit '1be2de88bc9ed184e68ae298b08e475cff8007cd':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:57:07 +0000 (15:57 -0800)]

am cf186ed9: am 90e04d85: am a8227bbe: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip

* commit 'cf186ed9d2bbb1a995708fe60c0bfba43ce91056':

commit | commitdiff | tree

Tenghui Zhu [Mon, 5 Nov 2012 23:57:05 +0000 (15:57 -0800)]

am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches

* commit '2f09f14ea0b9314fe3ad69a54866ddfa383c8c82':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:57:05 +0000 (15:57 -0800)]

am ed621e41: am 0cb37459: am 0b549f61: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching.

* commit 'ed621e41bdee50673aad5a4456f73b7e2eec9e81':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:57:04 +0000 (15:57 -0800)]

am 1be90a1e: am 34457449: am fbe416ad: am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches

* commit '1be90a1e03b19a14a57cf243fe4c821bae1c60fc':

commit | commitdiff | tree

Bart Sears [Mon, 5 Nov 2012 23:57:03 +0000 (15:57 -0800)]

am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit '368127e5815811ffdc9181ca9ba4114c5b27a412':

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:57:03 +0000 (15:57 -0800)]

am abb36742: am 27fd152d: am 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches

* commit 'abb367429a626dfe11ccd64c77451dce357a780b':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:57:02 +0000 (15:57 -0800)]

am 59e23832: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches

* commit '59e23832fc445d98d2843e5fcef378c8a20a6e71':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:57:02 +0000 (15:57 -0800)]

am 3bc158f1: am c054647b: am 624ad6d0: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches

* commit '3bc158f1a2e7dd9b3a111e0df524a7ee34003bfc':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:57:01 +0000 (15:57 -0800)]

am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'ff601b2348e0740ab794a1c92f43c5d3219bd87f':

commit | commitdiff | tree

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':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:57:00 +0000 (15:57 -0800)]

am fbd46ca3: (-s ours) am 686dea53: am 5b41962e: am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'fbd46ca32d0f36cf25eeb0cf87642041542ffd7d':

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:56:59 +0000 (15:56 -0800)]

am d12b1e29: (-s ours) am a6b039ac: am 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit 'd12b1e2919b9d564890f5337723b5574f0536285':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:56:58 +0000 (15:56 -0800)]

am f78bf988: am 5da1c942: am 03470f4c: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches

* commit 'f78bf988f98b8baefa8cfe6e96089349b3f07a62':

commit | commitdiff | tree

Owen Lin [Mon, 5 Nov 2012 23:56:57 +0000 (15:56 -0800)]

am 42151616: am 8be75158: am 2fc6e3a5: am f3958f87: am adee31f0: Use TiledTexture for thumbnails.

* commit '4215161656a4756187da2a77d6da94e79e6d4a62':

commit | commitdiff | tree

Sascha Haeberling [Mon, 5 Nov 2012 23:56:55 +0000 (15:56 -0800)]

am 7024266d: am 0a0667cc: am a03998c9: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets.

* commit '7024266d7c660227b7b33be5086978e512aa8c31':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:56:54 +0000 (15:56 -0800)]

am df3931fe: am 68ba0176: am b004a6f9: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations.

* commit 'df3931fe6ffdfb5c7f7a5768715b6b22880c9049':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:56:53 +0000 (15:56 -0800)]

am 4ea794c8: am cf083183: am f60139ce: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches

* commit '4ea794c861579b9b88730cda0fe72a8b006e4fe0':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:51 +0000 (15:56 -0800)]

am abfa44cd: am ded6d0fe: am b3e7d7d8: am dc03ae14: Reset rotation flag

* commit 'abfa44cd01ef313368d86261462d9cf7de4deb7f':

commit | commitdiff | tree

Nicolas Roard [Mon, 5 Nov 2012 23:56:51 +0000 (15:56 -0800)]

am 2f5e8817: am 0dc0943f: am c0c5c138: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches

* commit '2f5e8817d175446f91d268cf6acfe86256539db5':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:50 +0000 (15:56 -0800)]

am 61529fbc: am 2147266d: am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches

* commit '61529fbca43ab4be49c26a94c08e1f51813c675d':

commit | commitdiff | tree

Doris Liu [Mon, 5 Nov 2012 23:56:50 +0000 (15:56 -0800)]

am ab84feb2: am 68f5000e: am c3d2b085: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches

* commit 'ab84feb2aecb7c2707f1ce76da46899e46b3986f':

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:56:49 +0000 (15:56 -0800)]

am 1d4ef504: am 6f444bb4: am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter

* commit '1d4ef5045715e07bb34c8c94c00cc783502e3cb8':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:56:48 +0000 (15:56 -0800)]

am 200e37fd: am 307eecfc: am d8ddd8d8: am c3a48597: am f46da69a: Increased touch tolerance in cropping.

* commit '200e37fd4664c61d04578a98104a29e5b33dd8b1':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:56:47 +0000 (15:56 -0800)]

am 73e7d153: am cbf27c96: am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE

* commit '73e7d153fb290122652062ea221a17e9a7e05712':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:56:47 +0000 (15:56 -0800)]

am b8965012: (-s ours) am 96ea647f: am e1036a50: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:56:46 +0000 (15:56 -0800)]

am 783e171c: am 3540bf03: am b3e89cab: (-s ours) Import translations. DO NOT MERGE

* commit '783e171c00f6dad5fad2c73489d1716ecde690cd':

commit | commitdiff | tree

Ruben Brunk [Mon, 5 Nov 2012 23:56:45 +0000 (15:56 -0800)]

am 1f52b30b: am 92ea0a90: am 2fe28fc3: am bdfccda8: am a4122499: Reworked crop/transform UI.

* commit '1f52b30b5a006625caff7a35f0d05680ae170bf5':

commit | commitdiff | tree

Baligh Uddin [Mon, 5 Nov 2012 23:56:44 +0000 (15:56 -0800)]

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

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

commit | commitdiff | tree

John Hoford [Mon, 5 Nov 2012 23:56:43 +0000 (15:56 -0800)]

am 5534e7b9: am 56311a81: am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '5534e7b90aa3d5c397aabbdbe9c4e400fd06680d':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:56:42 +0000 (15:56 -0800)]

am 262cea15: am d79cd799: am beda88a7: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip

* commit '262cea15333bb407c30cbf56c2182cbcc932b4a2':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:41 +0000 (15:56 -0800)]

am 8c3f8d73: am 1ce091fb: am 7c30dc01: am f22aa1a2: am 41a3a3be: Fix slider layout

* commit '8c3f8d739aaa71da2940cea6e1ca05e0e2ed6709':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:39 +0000 (15:56 -0800)]

am 58e93517: am aeff41bd: am 808a5869: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches

* commit '58e93517ddbb04b57b7150c2ffd3192e3de84ab3':

commit | commitdiff | tree

John Reck [Mon, 5 Nov 2012 23:56:38 +0000 (15:56 -0800)]

am 25df492e: am e3e394a4: am 590acf86: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches

* commit '25df492e4f885f6f398deeb735df1229208f0a52':

commit | commitdiff | tree

George Mount [Mon, 5 Nov 2012 23:56:36 +0000 (15:56 -0800)]

am 4d6c4c61: am b4bbd952: am 0827ebf0: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches

* commit '4d6c4c61237901c0ebb57cef1b2761107fb23b67':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:34 +0000 (15:56 -0800)]

am dcfb900a: am a41df7c2: am 30fd4b42: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches

* commit 'dcfb900ad1e248b9774698798f0a5a907cff8a08':

commit | commitdiff | tree

Sascha Haeberling [Mon, 5 Nov 2012 23:56:33 +0000 (15:56 -0800)]

am 3a493702: am 80fd6f77: 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 '3a493702fa0df517b1ee5f9f66672fe5a3b50d01':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:31 +0000 (15:56 -0800)]

am a7fe97bf: am d6bb72ec: am 05757033: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves

* commit 'a7fe97bf11a17126f9ce113959b1009f572b4bf4':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:29 +0000 (15:56 -0800)]

am f1644cf6: am cac3cd19: am 4626ebd1: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches

* commit 'f1644cf629c86dfc8b5cc92793fcc71d9ece1084':

commit | commitdiff | tree

Bobby Georgescu [Mon, 5 Nov 2012 23:56:27 +0000 (15:56 -0800)]

am 615b7db5: am e7e7059b: am 75a448eb: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches

* commit '615b7db57d811c05562e15837fe2ea902b32c10e':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:25 +0000 (15:56 -0800)]

am a9d22064: am 1c196316: am b8f4ea38: am e5a3ff76: am a9f280f9: Add copyright notices

* commit 'a9d2206470d3202e5a376baf47a4fef69fc2e7b1':

commit | commitdiff | tree

nicolasroard [Mon, 5 Nov 2012 23:56:24 +0000 (15:56 -0800)]