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

(root) / android-x86 / packages-apps-Camera2.git / log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Baligh Uddin [Tue, 6 Nov 2012 22:38:49 +0000 (14:38 -0800)]

Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

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:52 +0000 (15:58 -0800)]

am 78b21f3b: am 954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '78b21f3bdbcd4f333c992df5ac009f985925addb':

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

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

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

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

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

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

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

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:46 +0000 (15:56 -0800)]

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

* commit '783e171c00f6dad5fad2c73489d1716ecde690cd':

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

* commit 'ded6d0fe3d87b64f30de5add511bfd24a7d0382d':

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

* commit '82d5861ef0874fdc02c5c151b67a96620e02b00f':

commit | commitdiff | tree

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

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

* commit 'ed035ad14569dd55234026f816e61089a077b0c5':

commit | commitdiff | tree

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

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

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

commit | commitdiff | tree

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

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

* commit '10d9ad75ea171d3877dd769fc548faa8d4297e36':

commit | commitdiff | tree

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

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

* commit 'ef70f93739398cef2d2b9975f15314351e079c75':

commit | commitdiff | tree

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

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

* commit '538d47a8229adf6ccf3ab970fbc0905093d7532f':

commit | commitdiff | tree

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

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

* commit '6ffd20961377a3fe7387e44ca8e590fc8f9c23b2':

commit | commitdiff | tree

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

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

* commit '9041daacefa2d8655fb8b717aa853d4b99574de8':

commit | commitdiff | tree

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

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

* commit '01b92c5fd6831b90084111893bd4bbb2ec5ba8b0':

commit | commitdiff | tree

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

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

* commit '8bab921b45e20d23a709091c8fa0a4318cba4944':

commit | commitdiff | tree

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

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

* commit '49f0a0a9e4e0b0e93c3c9c883c9110c308596570':

commit | commitdiff | tree

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

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

* commit '46d65dc0be97ed7cbf41c824fdecbb3709fc712e':

commit | commitdiff | tree

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

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

* commit '891ff2db8d5e0115f8f234732dd4fc8ece2f01a0':

commit | commitdiff | tree

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

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

* commit 'e31b12f172e45b447994f391eaedcaee58c0d687':

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

* commit 'f065bbbc7cfca42cea5f6760c82b57ac74a453ae':

commit | commitdiff | tree

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

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

* commit '874d36e4269b27e9e8dcb80341b38de1d3f41070':

commit | commitdiff | tree

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

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

* commit 'a1f8faebb38d349890f7f975926d8ff16bad296f':

commit | commitdiff | tree

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

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

* commit '2f5fceb76625e24bf07234506a5b7590a1fe821c':

commit | commitdiff | tree

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

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

* commit '28f3fb0f9541d992c18c4eae26fdd261968d5cd2':

commit | commitdiff | tree

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

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

* commit 'f96ce7f1591060e99dd8d6d5bdb25e162dd29706':

commit | commitdiff | tree

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

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

* commit '4554d9f5196a2b39fdb31b944611f2b2d0d9fb37':

commit | commitdiff | tree

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

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

* commit '645a868259c9e7668868f6fecedc8d65853b2344':

commit | commitdiff | tree

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

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

* commit '12aa029dd90d324f30e63308329e0436408211a1':

commit | commitdiff | tree

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

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

* commit '56edac84dccbdc97bceefa21e17ab75febfc8f6e':

commit | commitdiff | tree

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

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

* commit '659fd38058feb98b6ded74baf49d4ca0c11cc51a':

commit | commitdiff | tree

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

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

* commit '3f622aaec2b0af05e6ad8fef4b394a5ea9865586':

packages/apps/Camera2

RSS Atom

About OSDN

Find Software

Develop Software

Help