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

Michael Kolb [Wed, 17 Apr 2013 18:20:52 +0000 (11:20 -0700)]

am 2efb7da9: am 95cb5157: am 76193ba8: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

* commit '2efb7da949698896d9245702c3b27f170e616f7f':
Fix NPE in PieRenderer

commit | commitdiff | tree

Doris Liu [Wed, 17 Apr 2013 18:20:52 +0000 (11:20 -0700)]

am 0097e253: am a6e42ecb: am 2bcea6d6: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

* commit '0097e2534d11f21020f8616bf488c222b44db05e':
Fix ICS recording aspect ratio

commit | commitdiff | tree

Baligh Uddin [Mon, 15 Apr 2013 18:37:36 +0000 (11:37 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0054ad10c78ba5faf10dc8ba025845a2e2721e58
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Fri, 12 Apr 2013 18:22:33 +0000 (11:22 -0700)]

Import translations. DO NOT MERGE

Change-Id: I227e15361bc88443c8e44da8db5f7341d0c3eb33
Auto-generated-cl: translation import

commit | commitdiff | tree

Michael Kolb [Fri, 12 Apr 2013 17:38:27 +0000 (10:38 -0700)]

am 95cb5157: am 76193ba8: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

* commit '95cb5157b6691371190d08fc85237e91ac8e8121':
Fix NPE in PieRenderer

commit | commitdiff | tree

Doris Liu [Fri, 12 Apr 2013 17:38:24 +0000 (10:38 -0700)]

am a6e42ecb: am 2bcea6d6: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

* commit 'a6e42ecb7d4923a0a11c5581b34aa7b07107feef':
Fix ICS recording aspect ratio

commit | commitdiff | tree

Michael Kolb [Fri, 12 Apr 2013 16:59:41 +0000 (09:59 -0700)]

am 76193ba8: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

* commit '76193ba848ca9d146360224522835d2347e899c0':
Fix NPE in PieRenderer

commit | commitdiff | tree

Michael Kolb [Fri, 12 Apr 2013 16:54:18 +0000 (09:54 -0700)]

am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

* commit 'af998215b46e2b0ffaa2a47a762ba78f7c522e60':
Fix NPE in PieRenderer

commit | commitdiff | tree

Doris Liu [Fri, 12 Apr 2013 16:52:56 +0000 (09:52 -0700)]

am 2bcea6d6: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

* commit '2bcea6d69ba09568a4d64fb14fc062c04a8ab8b8':
Fix ICS recording aspect ratio

commit | commitdiff | tree

Michael Kolb [Fri, 12 Apr 2013 16:51:57 +0000 (16:51 +0000)]

Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce

commit | commitdiff | tree

Doris Liu [Fri, 12 Apr 2013 16:50:11 +0000 (09:50 -0700)]

am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

* commit 'd8259c06a0ed459eb937cf3bd3ddd79db1ea2533':
Fix ICS recording aspect ratio

commit | commitdiff | tree

Doris Liu [Fri, 12 Apr 2013 16:47:05 +0000 (16:47 +0000)]

Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce

commit | commitdiff | tree

Michael Kolb [Fri, 12 Apr 2013 15:45:25 +0000 (08:45 -0700)]

Fix NPE in PieRenderer

Bug: 8579025

Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Apr 2013 03:47:29 +0000 (20:47 -0700)]

am 1fb1150a: am dd185557: am eb0347b9: am 6cfb081c: G+ crop overlay shadows. Aspect ratios.

* commit '1fb1150af4bdaac97ee8580f24ab08124f0cdf28':
G+ crop overlay shadows. Aspect ratios.

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Apr 2013 03:43:56 +0000 (20:43 -0700)]

am dd185557: am eb0347b9: am 6cfb081c: G+ crop overlay shadows. Aspect ratios.

* commit 'dd1855572f0e354a18bee8876f182068c8b2d849':
G+ crop overlay shadows. Aspect ratios.

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Apr 2013 03:40:29 +0000 (20:40 -0700)]

am eb0347b9: am 6cfb081c: G+ crop overlay shadows. Aspect ratios.

* commit 'eb0347b95eb58fca649aa13c533775d19fd57927':
G+ crop overlay shadows. Aspect ratios.

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Apr 2013 03:37:44 +0000 (20:37 -0700)]

am 6cfb081c: G+ crop overlay shadows. Aspect ratios.

* commit '6cfb081cdf5acf454ecb05c50c575bcb3ce74cf0':
G+ crop overlay shadows. Aspect ratios.

commit | commitdiff | tree

Ruben Brunk [Fri, 12 Apr 2013 01:01:25 +0000 (18:01 -0700)]

G+ crop overlay shadows. Aspect ratios.

Bug: 8597538

Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909

commit | commitdiff | tree

Doris Liu [Wed, 10 Apr 2013 18:52:40 +0000 (11:52 -0700)]

Fix ICS recording aspect ratio

Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0

commit | commitdiff | tree

Bobby Georgescu [Thu, 11 Apr 2013 23:07:19 +0000 (16:07 -0700)]

am d169078d: am a9ff51c5: am 0fc0fbf1: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

* commit 'd169078dab52e5ec6e174dd461769cb085befae7':
Show loading indicator in full-screen importer view

commit | commitdiff | tree

Bobby Georgescu [Thu, 11 Apr 2013 23:03:47 +0000 (16:03 -0700)]

am a9ff51c5: am 0fc0fbf1: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

* commit 'a9ff51c5b3d8895ab95929739cb5cc406cd5aadf':
Show loading indicator in full-screen importer view

commit | commitdiff | tree

Bobby Georgescu [Thu, 11 Apr 2013 23:00:58 +0000 (16:00 -0700)]

am 0fc0fbf1: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

* commit '0fc0fbf14b8113b2655ae798ef9d7616f37f0d68':
Show loading indicator in full-screen importer view

commit | commitdiff | tree

Angus Kong [Thu, 11 Apr 2013 22:56:37 +0000 (15:56 -0700)]

am 527af0df: am a3c16e5b: am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit '527af0df9587f04bea16735949a37fbe8d356462':
Integrate FilmStripView.

commit | commitdiff | tree

Bobby Georgescu [Thu, 11 Apr 2013 22:56:11 +0000 (15:56 -0700)]

am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

* commit 'e51f236bfcc617979871f0be7ce46691cf5415c8':
Show loading indicator in full-screen importer view

commit | commitdiff | tree

Angus Kong [Thu, 11 Apr 2013 22:52:49 +0000 (15:52 -0700)]

am a3c16e5b: am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit 'a3c16e5b3e1b1e45b622cc012a3a0e6d0cbcc41d':
Integrate FilmStripView.

commit | commitdiff | tree

Bobby Georgescu [Thu, 11 Apr 2013 22:52:42 +0000 (22:52 +0000)]

Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce

commit | commitdiff | tree

Angus Kong [Thu, 11 Apr 2013 22:49:00 +0000 (15:49 -0700)]

am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit 'bdb3578486870647fe24d8bae74eaed552d6527b':
Integrate FilmStripView.

commit | commitdiff | tree

Bobby Georgescu [Thu, 11 Apr 2013 22:34:00 +0000 (15:34 -0700)]

Show loading indicator in full-screen importer view

Bug: 8599282
Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f

commit | commitdiff | tree

Angus Kong [Thu, 11 Apr 2013 22:45:03 +0000 (15:45 -0700)]

am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce

* commit '2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90':
Integrate FilmStripView.

commit | commitdiff | tree

Angus Kong [Thu, 11 Apr 2013 22:42:12 +0000 (22:42 +0000)]

Merge "Integrate FilmStripView." into gb-ub-photos-bryce

commit | commitdiff | tree

George Mount [Thu, 11 Apr 2013 22:02:52 +0000 (15:02 -0700)]

am 49bdc9dd: am 46e60b07: am 85233f2c: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

* commit '49bdc9ddb8035b4e0218cc002062ecb2302cf090':
Add _COUNT support for PhotoProvider to help performance of All Photos.

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 22:02:51 +0000 (15:02 -0700)]

am 1da23d81: am e27690be: am f2b05458: am ea2fa83c: Setup geometry xforms and propogation chain.

* commit '1da23d81eaa4d19f88963cb416a91845fd528cf8':
Setup geometry xforms and propogation chain.

commit | commitdiff | tree

George Mount [Thu, 11 Apr 2013 21:58:22 +0000 (14:58 -0700)]

am 46e60b07: am 85233f2c: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

* commit '46e60b07f086646c842255a614d895ae07a08f6e':
Add _COUNT support for PhotoProvider to help performance of All Photos.

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 21:58:16 +0000 (14:58 -0700)]

am e27690be: am f2b05458: am ea2fa83c: Setup geometry xforms and propogation chain.

* commit 'e27690befeb135e7f63061bfe48a03c72ec8adaf':
Setup geometry xforms and propogation chain.

commit | commitdiff | tree

George Mount [Thu, 11 Apr 2013 20:56:12 +0000 (13:56 -0700)]

am 85233f2c: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

* commit '85233f2c08759aa4731314899dbe43cfc16adc6f':
Add _COUNT support for PhotoProvider to help performance of All Photos.

commit | commitdiff | tree

George Mount [Thu, 11 Apr 2013 20:54:37 +0000 (13:54 -0700)]

am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

* commit '34a50f0c3db6890e857abc68f5b9280f95c14d2e':
Add _COUNT support for PhotoProvider to help performance of All Photos.

commit | commitdiff | tree

George Mount [Thu, 11 Apr 2013 20:52:32 +0000 (20:52 +0000)]

Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 20:30:48 +0000 (13:30 -0700)]

am f2b05458: am ea2fa83c: Setup geometry xforms and propogation chain.

* commit 'f2b0545806a679e38e230233c80080a5d9c24033':
Setup geometry xforms and propogation chain.

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 20:27:18 +0000 (13:27 -0700)]

am ea2fa83c: Setup geometry xforms and propogation chain.

* commit 'ea2fa83c2dd2b59b8a67ec363e4ac431748f997b':
Setup geometry xforms and propogation chain.

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 19:39:03 +0000 (12:39 -0700)]

Setup geometry xforms and propogation chain.

Bug: 8597538

Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388

commit | commitdiff | tree

Angus Kong [Tue, 9 Apr 2013 22:02:59 +0000 (15:02 -0700)]

Integrate FilmStripView.

Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d

commit | commitdiff | tree

Doris Liu [Thu, 11 Apr 2013 17:17:18 +0000 (10:17 -0700)]

am 5294a3b4: am cad5c880: am 901b8e1a: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce

* commit '5294a3b4e648aa7b1486a685c066b2e6dbe40ee9':
Fix camera preview being squished

commit | commitdiff | tree

George Mount [Tue, 9 Apr 2013 20:45:09 +0000 (13:45 -0700)]

Add _COUNT support for PhotoProvider to help performance of All Photos.

Bug 8594818

Change-Id: Iab14a945e33ffcbf539b1d7acc704538e4bf48b6

commit | commitdiff | tree

Doris Liu [Thu, 11 Apr 2013 17:13:31 +0000 (10:13 -0700)]

am cad5c880: am 901b8e1a: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce

* commit 'cad5c880350422cb9110cf9c61c8d38c302e5c92':
Fix camera preview being squished

commit | commitdiff | tree

Doris Liu [Thu, 11 Apr 2013 17:11:48 +0000 (10:11 -0700)]

am 901b8e1a: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce

* commit '901b8e1abb5d53db44abfcfe44168e0cdc45a902':
Fix camera preview being squished

commit | commitdiff | tree

Doris Liu [Thu, 11 Apr 2013 17:09:47 +0000 (10:09 -0700)]

am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce

* commit '1f60d9cd60e01da716a736803994ce14016947ac':
Fix camera preview being squished

commit | commitdiff | tree

Doris Liu [Thu, 11 Apr 2013 17:07:25 +0000 (17:07 +0000)]

Merge "Fix camera preview being squished" into gb-ub-photos-bryce

commit | commitdiff | tree

The Android Open Source Project [Thu, 11 Apr 2013 14:54:34 +0000 (07:54 -0700)]

am 42261cac: (-s ours) am 7906ee68: Reconcile with jb-mr2-release - do not merge

* commit '42261cac62383adf1a45c7a4077e61ce56665568':

commit | commitdiff | tree

The Android Open Source Project [Thu, 11 Apr 2013 14:50:53 +0000 (07:50 -0700)]

am 7906ee68: Reconcile with jb-mr2-release - do not merge

* commit '7906ee682bef8d0acd15fd3e0852697100606f29':

commit | commitdiff | tree

The Android Open Source Project [Thu, 11 Apr 2013 14:45:23 +0000 (07:45 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I04fc3a249c15bac81c330ad09fd9edeca78b784f

commit | commitdiff | tree

The Android Automerger [Thu, 11 Apr 2013 12:55:54 +0000 (05:55 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 03:51:44 +0000 (20:51 -0700)]

am 688e0fef: am 468542ec: am 8c18867c: am 41185c4f: Fix downsampling check in crop.

* commit '688e0fef59e1ae8843b201155b7e74b7f2f9cce5':
Fix downsampling check in crop.

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 03:48:02 +0000 (20:48 -0700)]

am 468542ec: am 8c18867c: am 41185c4f: Fix downsampling check in crop.

* commit '468542ec0dc136c6703076bf2cc72fe3140f0eef':
Fix downsampling check in crop.

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 03:44:20 +0000 (20:44 -0700)]

am 8c18867c: am 41185c4f: Fix downsampling check in crop.

* commit '8c18867c4dce46eb80ba02732a3cbe0c420e6a64':
Fix downsampling check in crop.

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 03:40:41 +0000 (20:40 -0700)]

am 41185c4f: Fix downsampling check in crop.

* commit '41185c4fdbccad17b79697306a7f8044b8f7ffd3':
Fix downsampling check in crop.

commit | commitdiff | tree

Ruben Brunk [Thu, 11 Apr 2013 00:27:33 +0000 (17:27 -0700)]

Fix downsampling check in crop.

Bug: 8586301
Change-Id: I4c5441f779122adb984368609cfea39a60190848

commit | commitdiff | tree

Doris Liu [Wed, 10 Apr 2013 23:43:43 +0000 (16:43 -0700)]

Fix camera preview being squished

Bug: 8585407
Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:12:10 +0000 (13:12 -0700)]

am eefa9dfa: (-s ours) am 2a9ce784: am 5bb44c4b: am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:12:09 +0000 (13:12 -0700)]

am 08554c90: (-s ours) am 55f7eb96: am a084c8d3: am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '08554c90c46b063953442824c7b793c53b84223c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:12:08 +0000 (13:12 -0700)]

am 120e2a4d: (-s ours) am e67741ab: am 3869b8db: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '120e2a4df2b49ae6628f698d7949c0d77b5eb6da':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:12:07 +0000 (13:12 -0700)]

am 6deece68: (-s ours) am f6800b4d: am 35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '6deece6876b4e7cb357974196f56b1ef34312141':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:06:58 +0000 (13:06 -0700)]

am 2a9ce784: am 5bb44c4b: am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '2a9ce78469937c974f243ad45ef4548c8017b25d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:06:58 +0000 (13:06 -0700)]

am 55f7eb96: am a084c8d3: am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '55f7eb9680a6f2fe3003e4cec5b9ea88bb02b1bf':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:06:57 +0000 (13:06 -0700)]

am e67741ab: am 3869b8db: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:06:56 +0000 (13:06 -0700)]

am f6800b4d: am 35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:04:03 +0000 (13:04 -0700)]

am 5bb44c4b: am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '5bb44c4bef4190364ef0fa34ef643c926e42803a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:04:02 +0000 (13:04 -0700)]

am a084c8d3: am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:04:01 +0000 (13:04 -0700)]

am 3869b8db: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '3869b8db1b66c1a470c03d4b97455e3608c4f990':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:04:00 +0000 (13:04 -0700)]

am 35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '35e29cb6f248176682fd88b6a7bf8c99487551ff':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:01:26 +0000 (13:01 -0700)]

am 9a5129cd: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '9a5129cdfbe83379453adef4005bb73178a116b4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 20:01:25 +0000 (13:01 -0700)]

am a54163ad: (-s ours) Merge "Import translations. DO NOT MERGE"

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

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:59:22 +0000 (12:59 -0700)]

am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '27b9459f3764d45d46092aa541e691ff861e0aff':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:59:21 +0000 (12:59 -0700)]

am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

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

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:58:48 +0000 (19:58 +0000)]

Merge "Import translations. DO NOT MERGE" into master-security-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:58:35 +0000 (19:58 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:58:23 +0000 (19:58 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:58:12 +0000 (19:58 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:58:02 +0000 (19:58 +0000)]

Merge "Import translations. DO NOT MERGE" into master-security-dev

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:57:48 +0000 (19:57 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:57:38 +0000 (19:57 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 19:57:27 +0000 (19:57 +0000)]

Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

commit | commitdiff | tree

Bobby Georgescu [Wed, 10 Apr 2013 19:54:24 +0000 (12:54 -0700)]

am 87d57574: am f9c5cd31: am f5e37e42: am 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce

* commit '87d57574b538f5eac5444374e534c1ecc04c8c6e':
Correctly scale images in MTP importer

commit | commitdiff | tree

Bobby Georgescu [Wed, 10 Apr 2013 19:51:33 +0000 (12:51 -0700)]

am f9c5cd31: am f5e37e42: am 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce

* commit 'f9c5cd315f6b5fe87655c59397de604285c64b39':
Correctly scale images in MTP importer

commit | commitdiff | tree

Bobby Georgescu [Wed, 10 Apr 2013 19:47:39 +0000 (12:47 -0700)]

am f5e37e42: am 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce

* commit 'f5e37e421790f01024f846d4bc45c6da0c00fb3f':
Correctly scale images in MTP importer

commit | commitdiff | tree

Bobby Georgescu [Wed, 10 Apr 2013 19:42:13 +0000 (12:42 -0700)]

am 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce

* commit '6b138c2240d35571e1f49258f84ec2659223d251':
Correctly scale images in MTP importer

commit | commitdiff | tree

Bobby Georgescu [Wed, 10 Apr 2013 19:39:42 +0000 (19:39 +0000)]

Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Wed, 10 Apr 2013 19:02:52 +0000 (12:02 -0700)]

am 07261700: am 97c6f7c9: am 3bc8cc41: am b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce

* commit '07261700719f9af8eda00f9be23bf3d53dc597fd':
Adding simple crop ui. Refactoring.

commit | commitdiff | tree

Ruben Brunk [Wed, 10 Apr 2013 18:59:33 +0000 (11:59 -0700)]

am 97c6f7c9: am 3bc8cc41: am b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce

* commit '97c6f7c92e78cc61e53de60f353ff4b48b2fe454':
Adding simple crop ui. Refactoring.

commit | commitdiff | tree

Ruben Brunk [Wed, 10 Apr 2013 18:56:43 +0000 (11:56 -0700)]

am 3bc8cc41: am b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce

* commit '3bc8cc417e7b874b7b3f401cc33f073756762ebf':
Adding simple crop ui. Refactoring.

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 18:55:20 +0000 (11:55 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib687e618b0e915d269175ec18af6b6f016af4022
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 18:55:01 +0000 (11:55 -0700)]

Import translations. DO NOT MERGE

Change-Id: I887a07d700cdfc672db20cc1775e9d65b4ca0bda
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 18:54:42 +0000 (11:54 -0700)]

Import translations. DO NOT MERGE

Change-Id: I6e2a262f7c5c46a89c3298d86969347338be77ce
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 18:54:22 +0000 (11:54 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0bf928fbe2856bb3519c3586fb91422ee87da533
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 18:53:59 +0000 (11:53 -0700)]

Import translations. DO NOT MERGE

Change-Id: I5b5670a94af6745f04cb0eba67ca7cd18ae6e4d6
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 18:53:28 +0000 (11:53 -0700)]

Import translations. DO NOT MERGE

Change-Id: I3bc2cd867e0271fe202d8561d9f667a110a82c5f
Auto-generated-cl: translation import

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 18:52:53 +0000 (11:52 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9789a0f1295136ca95b2d7b19d7fa6f0dc13e192
Auto-generated-cl: translation import

commit | commitdiff | tree

Ruben Brunk [Wed, 10 Apr 2013 18:52:51 +0000 (11:52 -0700)]

am b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce

* commit 'b6b2d1c45f889ca0388b11bb49ae0ce1a1694e90':
Adding simple crop ui. Refactoring.

commit | commitdiff | tree

Baligh Uddin [Wed, 10 Apr 2013 18:52:19 +0000 (11:52 -0700)]

Import translations. DO NOT MERGE

Change-Id: I7d953d7ca29bd4ffd4ba96270845448fb6c3d194
Auto-generated-cl: translation import

commit | commitdiff | tree

Bobby Georgescu [Wed, 10 Apr 2013 18:46:56 +0000 (11:46 -0700)]

Correctly scale images in MTP importer

Bug: 8293048
Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4

commit | commitdiff | tree

Ruben Brunk [Wed, 10 Apr 2013 18:47:38 +0000 (18:47 +0000)]

Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce