OSDN Git Service
The Android Open Source Project [Thu, 8 Nov 2012 23:47:53 +0000 (15:47 -0800)]
am
5a51d6a2: am
b7a115c7: Reconcile with jb-mr1-release - do not merge
* commit '
5a51d6a23d7e2ab7fabcc88e71cd59454b692d09':
John Hoford [Thu, 8 Nov 2012 23:45:18 +0000 (15:45 -0800)]
am
0ede5c51: am
4c1614b7: am
8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE
* commit '
0ede5c513d0c37c26f921b9e1ef25eb04b1f383b':
reduce size of tiny planet if malloc fails - DO NOT MERGE
The Android Open Source Project [Thu, 8 Nov 2012 23:44:34 +0000 (15:44 -0800)]
am
286e9cd8: am
d7545049: Reconcile with jb-mr1-release - do not merge
* commit '
286e9cd80827518e75de282fd88f1352656a7a6d':
Baligh Uddin [Thu, 8 Nov 2012 23:42:28 +0000 (15:42 -0800)]
am
94183ec3: am
3375b227: am
2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
94183ec33f6a99069976236a7090d9f26e262e28':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 8 Nov 2012 22:22:22 +0000 (14:22 -0800)]
am
b7a115c7: Reconcile with jb-mr1-release - do not merge
* commit '
b7a115c77ad4852aae5ec2ce30ea2b05f3dd1d75':
The Android Open Source Project [Thu, 8 Nov 2012 22:19:21 +0000 (14:19 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Id8f361c784adbf1b22de8a82b4cbdc2ea3a15bf7
The Android Automerger [Thu, 8 Nov 2012 21:54:14 +0000 (13:54 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
John Hoford [Thu, 8 Nov 2012 20:06:25 +0000 (12:06 -0800)]
am
4c1614b7: am
8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE
* commit '
4c1614b7845252209742411acd09723e2245b8f8':
reduce size of tiny planet if malloc fails - DO NOT MERGE
John Hoford [Thu, 8 Nov 2012 20:04:26 +0000 (12:04 -0800)]
am
8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE
* commit '
8253c35a5d9564afbc667f7a9f42fdc0a734bcf8':
reduce size of tiny planet if malloc fails - DO NOT MERGE
John Hoford [Thu, 8 Nov 2012 18:41:24 +0000 (10:41 -0800)]
reduce size of tiny planet if malloc fails - DO NOT MERGE
bug:
7477815
Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
The Android Open Source Project [Thu, 8 Nov 2012 16:58:02 +0000 (08:58 -0800)]
am
d7545049: Reconcile with jb-mr1-release - do not merge
* commit '
d7545049bfe7142389eae84394d6b76ed9b68fb2':
The Android Open Source Project [Thu, 8 Nov 2012 16:54:32 +0000 (08:54 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I8db9fb7159802c84866bdc4edd136c9a75880397
The Android Open Source Project [Thu, 8 Nov 2012 14:27:05 +0000 (06:27 -0800)]
am
486ac238: am
5636617c: Reconcile with jb-mr1-release - do not merge
* commit '
486ac23882dcca5998a8914f3f80e2597537ffd9':
Baligh Uddin [Thu, 8 Nov 2012 14:13:57 +0000 (06:13 -0800)]
am
ab003a08: am
a6bb1711: am
da700ab4: am
85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
ab003a084049320807f72341fa260ae133c13c73':
Import translations. DO NOT MERGE
Bobby Georgescu [Thu, 8 Nov 2012 14:13:56 +0000 (06:13 -0800)]
am
c06e9eab: am
75bf0030: am
88571794: am
9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '
c06e9eab7510549b87935b3c1179cfa6f3f78819':
Fix scenario where launching Gallery launches Camera
Baligh Uddin [Thu, 8 Nov 2012 14:13:04 +0000 (06:13 -0800)]
am
7449dd34: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '
7449dd3417c652fca4689d4db69413492abea429':
Import translations. DO NOT MERGE
The Android Automerger [Wed, 7 Nov 2012 21:06:04 +0000 (13:06 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 19:42:37 +0000 (11:42 -0800)]
am
3375b227: am
2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
3375b2274ce109fbe8f8d1804655a9eadaa067a0':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:38:49 +0000 (11:38 -0800)]
am
2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2a8405d7e5439e1098598f47081530c550733f12':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:37:05 +0000 (11:37 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
The Android Open Source Project [Wed, 7 Nov 2012 18:24:20 +0000 (10:24 -0800)]
am
5636617c: Reconcile with jb-mr1-release - do not merge
* commit '
5636617ce28f4ce2e5bb8a5bce35dbd57b79b14a':
The Android Open Source Project [Wed, 7 Nov 2012 18:20:11 +0000 (10:20 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Id3f4eff2714ec8ba5146b23954cf3cf3e811564b
The Android Automerger [Wed, 7 Nov 2012 02:04:20 +0000 (18:04 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 00:12:07 +0000 (16:12 -0800)]
am
a6bb1711: am
da700ab4: am
85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
a6bb17113d7e0cc8e3299b6838afe40f88aff41d':
Import translations. DO NOT MERGE
Bobby Georgescu [Wed, 7 Nov 2012 00:12:06 +0000 (16:12 -0800)]
am
75bf0030: am
88571794: am
9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '
75bf003033dc9c0131a9669e8d7d9ebc51ec2dc8':
Fix scenario where launching Gallery launches Camera
Baligh Uddin [Wed, 7 Nov 2012 00:09:05 +0000 (16:09 -0800)]
am
da700ab4: am
85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
da700ab4ded11912e96606b2a0df3199bdbeb9d5':
Import translations. DO NOT MERGE
Bobby Georgescu [Wed, 7 Nov 2012 00:09:04 +0000 (16:09 -0800)]
am
88571794: am
9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '
885717944569c84527a0ac9bc8a17f7c5c1f4b76':
Fix scenario where launching Gallery launches Camera
Baligh Uddin [Wed, 7 Nov 2012 00:06:30 +0000 (16:06 -0800)]
am
85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
85d20a07d6412f453e7956c105ff8f8548094186':
Import translations. DO NOT MERGE
Bobby Georgescu [Wed, 7 Nov 2012 00:06:28 +0000 (16:06 -0800)]
am
9ec5de9d: Fix scenario where launching Gallery launches Camera
* commit '
9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466':
Fix scenario where launching Gallery launches Camera
Baligh Uddin [Tue, 6 Nov 2012 22:38:49 +0000 (14:38 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Tue, 6 Nov 2012 22:37:44 +0000 (14:37 -0800)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
The Android Open Source Project [Tue, 6 Nov 2012 20:37:50 +0000 (12:37 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Iafda9f08a3e708cf3ea08ffb51ba693d356c64cd
The Android Open Source Project [Tue, 6 Nov 2012 20:29:55 +0000 (12:29 -0800)]
am
091ccbe8: am
4dd6c535: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
091ccbe8cd80c974d1eaa849028a7055c6b900e9':
The Android Open Source Project [Tue, 6 Nov 2012 20:23:58 +0000 (12:23 -0800)]
am
4dd6c535: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
4dd6c535cef6e9c05143cb5cf066a4c71c968da9':
Do not add crop into preset if in inital setup
Fix conflict with other build fix
Fix build
Fix SRI Pano orientation
Update the assets of unlock and camera icons in filmstrip.
Fix NPE due to progress bar not existing.
Fix share crash after closing photo editor
Set the thumbnail/screennail sizes based on screensize
New UI...
Upscale images to fill screen for slideshow
Snap back photo after swipe in y-direction in filmstrip
Fix ANR in image editor
Fix crash, remove logging added to diagnose bug
More logs for gallery crash error, remove a potential cause
Fix Monkey NPE
Grid/filmstrip switching behavior improvements
Reskin: Fix stability bugs introduced by reskin
Fix NPE, ANRs in Gallery
Fix ANRs in Gallery
The Android Open Source Project [Tue, 6 Nov 2012 20:18:23 +0000 (12:18 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ic5ee78e018bd5706185edd8b01de3cb6bf121ed4
Baligh Uddin [Tue, 6 Nov 2012 19:58:29 +0000 (11:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib39956c1bb4450f46f79406ccf1cf67780c63e22
Auto-generated-cl: translation import
Baligh Uddin [Tue, 6 Nov 2012 19:58:01 +0000 (11:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2b49cdd47d86ce1fece6b32e87907a8b6158ef2d
Auto-generated-cl: translation import
Baligh Uddin [Tue, 6 Nov 2012 19:56:55 +0000 (11:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8d3e81b4f27c10ad7b24ada7d7bb066f45dd29c5
Auto-generated-cl: translation import
Bobby Georgescu [Tue, 6 Nov 2012 05:21:55 +0000 (21:21 -0800)]
Fix scenario where launching Gallery launches Camera
Bug:
7479102
Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4
The Android Automerger [Tue, 6 Nov 2012 10:28:01 +0000 (02:28 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 6 Nov 2012 02:39:06 +0000 (18:39 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Baligh Uddin [Tue, 6 Nov 2012 00:01:14 +0000 (16:01 -0800)]
am
c08688e0: am
78b21f3b: am
954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
c08688e04f0af1b544d368997dad1d22a5481715':
John Spurlock [Tue, 6 Nov 2012 00:01:13 +0000 (16:01 -0800)]
am
6b839922: am
613df30f: Fix the remaining black blip in secure camera transition.
* commit '
6b8399228a172dd755cf54dde0c69e661d0778d6':
Fix the remaining black blip in secure camera transition.
Bart Sears [Tue, 6 Nov 2012 00:01:12 +0000 (16:01 -0800)]
am
83d895be: am
5c009849: am
70fb3773: am
b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
* commit '
83d895be88ea30fe919c5a404f818db092ed853c':
Baligh Uddin [Tue, 6 Nov 2012 00:01:11 +0000 (16:01 -0800)]
am
6e40fd65: am
5bfc65cc: am
f350beb8: (-s ours) am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
6e40fd65471336323a2d80967dcb5c1357d24899':
Baligh Uddin [Tue, 6 Nov 2012 00:01:10 +0000 (16:01 -0800)]
am
64668b53: am
ca6b4f81: Import translations. DO NOT MERGE
* commit '
64668b53cc8cbe5c6531f00490226d95e8f0d8f1':
Import translations. DO NOT MERGE
George Mount [Tue, 6 Nov 2012 00:01:08 +0000 (16:01 -0800)]
am
43caccfd: am
53e69d67: am
bd52f5e7: am
25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '
43caccfd56f23f2d03fb74ca684ca1ecdf24c6e8':
Bart Sears [Tue, 6 Nov 2012 00:01:07 +0000 (16:01 -0800)]
am
1001089c: am
306ec5fd: am
77262bd5: am
40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '
1001089c65137d0f6562370052034e3b5aafb553':
Sascha Haeberling [Tue, 6 Nov 2012 00:01:06 +0000 (16:01 -0800)]
am
58514882: am
d1dbc515: am
452ce867: am
769d38db: Fix tiny planet not using XMP metadata anymore
* commit '
58514882d35b4b7be049da9acdbe72e6134d4109':
Baligh Uddin [Tue, 6 Nov 2012 00:01:05 +0000 (16:01 -0800)]
am
6d0b2f4e: am
051b6cdd: am
8405f65e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
6d0b2f4e736e369e1691ab6f2e903dc056cfdde0':
Baligh Uddin [Tue, 6 Nov 2012 00:01:04 +0000 (16:01 -0800)]
am
d6627d90: am
af479cb3: am
f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
d6627d9021b1480a0de8e2e1b370680eb1fe6963':
Baligh Uddin [Tue, 6 Nov 2012 00:01:02 +0000 (16:01 -0800)]
am
5bfbac9f: am
990cdc38: am
692a8536: (-s ours) am
262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
5bfbac9f362b807d2ad5a93a6535c4bade10b06f':
Baligh Uddin [Tue, 6 Nov 2012 00:01:01 +0000 (16:01 -0800)]
am
df794051: am
c350cd25: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
df79405147fea614f55ef5f101a9745e68b85407':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 23:59:37 +0000 (15:59 -0800)]
am
963c8007: am
bfd77884: am
a65e41a8: (-s ours) am
8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
963c800786a7826df1803b85aca3b355bafd6320':
Baligh Uddin [Mon, 5 Nov 2012 23:59:36 +0000 (15:59 -0800)]
am
215ab980: am
dc304a73: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
215ab980e7f880e316cb405c6d79f5a383877217':
Import translations. DO NOT MERGE
Wu-cheng Li [Mon, 5 Nov 2012 23:59:35 +0000 (15:59 -0800)]
am
f143f5d8: am
585638c0: am
88cef187: am
471d8986: Add keyguard camera widget meta-data to gallery manifest.
* commit '
f143f5d86826506a72b985a6e89ed53544ed1c60':
Mangesh Ghiware [Mon, 5 Nov 2012 23:59:33 +0000 (15:59 -0800)]
am
5019393a: am
04024d64: am
0514c285: am
589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem
* commit '
5019393a4e773080add5623aa5b0b56cee0c512e':
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':
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':
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':
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':
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':
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
Baligh Uddin [Mon, 5 Nov 2012 23:58:52 +0000 (15:58 -0800)]
am
78b21f3b: am
954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
78b21f3bdbcd4f333c992df5ac009f985925addb':
John Spurlock [Mon, 5 Nov 2012 23:58:50 +0000 (15:58 -0800)]
am
613df30f: Fix the remaining black blip in secure camera transition.
* commit '
613df30fff8cea9ddfd6547769d8cac6346e11f1':
Fix the remaining black blip in secure camera transition.
Bart Sears [Mon, 5 Nov 2012 23:58:49 +0000 (15:58 -0800)]
am
5c009849: am
70fb3773: am
b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
* commit '
5c009849cc632750240e8d74a2a717a4ce526518':
Baligh Uddin [Mon, 5 Nov 2012 23:58:48 +0000 (15:58 -0800)]
am
5bfc65cc: am
f350beb8: (-s ours) am
3252800c: (-s ours) Import translations. DO NOT MERGE
* commit '
5bfc65cc617e05c5a88d4038874e25ccd4018ae9':
Baligh Uddin [Mon, 5 Nov 2012 23:58:47 +0000 (15:58 -0800)]
am
ca6b4f81: Import translations. DO NOT MERGE
* commit '
ca6b4f813654744d5208f71463ed4adf36159d3b':
Import translations. DO NOT MERGE
George Mount [Mon, 5 Nov 2012 23:58:46 +0000 (15:58 -0800)]
am
53e69d67: am
bd52f5e7: am
25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
* commit '
53e69d67316c8ee50429d41a79061507b8bfd89f':
Bart Sears [Mon, 5 Nov 2012 23:58:45 +0000 (15:58 -0800)]
am
306ec5fd: am
77262bd5: am
40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '
306ec5fdd04fe8486ba048625ab0de5bf057d65a':
Sascha Haeberling [Mon, 5 Nov 2012 23:58:44 +0000 (15:58 -0800)]
am
d1dbc515: am
452ce867: am
769d38db: Fix tiny planet not using XMP metadata anymore
* commit '
d1dbc5151969ecc83f94a4a7dfbd79629f1870d0':
Baligh Uddin [Mon, 5 Nov 2012 23:58:43 +0000 (15:58 -0800)]
am
051b6cdd: am
8405f65e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
051b6cdd8faf7985490c4682af8c81bc316cfaa3':
Baligh Uddin [Mon, 5 Nov 2012 23:58:42 +0000 (15:58 -0800)]
am
af479cb3: am
f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
af479cb3b6ca11e846e5d7e19f546776fb7a08cc':
Baligh Uddin [Mon, 5 Nov 2012 23:58:41 +0000 (15:58 -0800)]
am
990cdc38: am
692a8536: (-s ours) am
262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
990cdc3814c7144420feff769434185e0a323f65':
Baligh Uddin [Mon, 5 Nov 2012 23:58:40 +0000 (15:58 -0800)]
am
c350cd25: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
c350cd25ffefdb923f57496df45c47dda628e70e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 23:57:09 +0000 (15:57 -0800)]
am
bfd77884: am
a65e41a8: (-s ours) am
8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
bfd77884974cbd1a29028156d9af9b67e6359696':
Baligh Uddin [Mon, 5 Nov 2012 23:57:08 +0000 (15:57 -0800)]
am
dc304a73: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
dc304a73d63f26828fefee941a59ccf12a7802b0':
Import translations. DO NOT MERGE
Wu-cheng Li [Mon, 5 Nov 2012 23:57:07 +0000 (15:57 -0800)]
am
585638c0: am
88cef187: am
471d8986: Add keyguard camera widget meta-data to gallery manifest.
* commit '
585638c08b9bb8c0a89dca412252e07b45b193d8':
Mangesh Ghiware [Mon, 5 Nov 2012 23:57:06 +0000 (15:57 -0800)]
am
04024d64: am
0514c285: am
589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem
* commit '
04024d6477cbbb60f3dabbcef34aada84672fb94':
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':
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':
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':
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':
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:56:51 +0000 (15:56 -0800)]
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':
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':
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':
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':
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
Baligh Uddin [Mon, 5 Nov 2012 23:55:20 +0000 (15:55 -0800)]
am
039e80be: am
4ecaa689: am
5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
039e80be8d5c7fabfd8e168d5e86ce83b33fb916':
Baligh Uddin [Mon, 5 Nov 2012 23:55:18 +0000 (15:55 -0800)]
am
caf70588: am
ebe62dc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
caf70588f7a97aaad805b008f91c750fe59b45b5':
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:53:50 +0000 (15:53 -0800)]
am
16f8aa84: am
fc8e6db7: am
10f64ff1: (-s ours) am
798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
* commit '
16f8aa849ac14a2bde2f3d06deaa4db7bd368108':
OSDN Git Service
