OSDN Git Service
John Hoford [Mon, 15 Apr 2013 18:52:07 +0000 (11:52 -0700)]
am
63ae852c: am
1c8e45bf: am
d2f5fe60: support for simplified parameters in filter
* commit '
63ae852c8f91fd53cf57cd50023382f17146d509':
support for simplified parameters in filter
John Hoford [Mon, 15 Apr 2013 18:50:00 +0000 (11:50 -0700)]
am
1c8e45bf: am
d2f5fe60: support for simplified parameters in filter
* commit '
1c8e45bfb4e0f331cb40d060a4dac455032f2d45':
support for simplified parameters in filter
John Hoford [Mon, 15 Apr 2013 18:48:13 +0000 (11:48 -0700)]
am
d2f5fe60: support for simplified parameters in filter
* commit '
d2f5fe607ee6d7b5f79862b495495e2f6024cdab':
support for simplified parameters in filter
John Hoford [Wed, 10 Apr 2013 21:58:05 +0000 (14:58 -0700)]
support for simplified parameters in filter
Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
The Android Open Source Project [Mon, 15 Apr 2013 17:53:14 +0000 (10:53 -0700)]
am
1e606658: Reconcile with jb-mr2-release - do not merge
* commit '
1e60665812eea64ac9094882908147cd0dc5d110':
am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
The Android Open Source Project [Mon, 15 Apr 2013 17:46:22 +0000 (10:46 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id113b987c3c1423d0af9464a63edcec9840cc870
The Android Automerger [Mon, 15 Apr 2013 12:56:15 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Sat, 13 Apr 2013 15:17:58 +0000 (08:17 -0700)]
am
a827ce9d: am
cba8574c: am
4b6ea5bc: Add direct rendering for border
* commit '
a827ce9d82c533f65d9e34691a593c6ebdd97ef3':
Add direct rendering for border
nicolasroard [Sat, 13 Apr 2013 15:15:58 +0000 (08:15 -0700)]
am
cba8574c: am
4b6ea5bc: Add direct rendering for border
* commit '
cba8574c2b42f61a11a7e01c2f706f0c1f9cfc9c':
Add direct rendering for border
nicolasroard [Sat, 13 Apr 2013 15:12:28 +0000 (08:12 -0700)]
am
4b6ea5bc: Add direct rendering for border
* commit '
4b6ea5bce9b68eea16eb8a0980501f671e7fbf44':
Add direct rendering for border
nicolasroard [Sat, 13 Apr 2013 00:47:14 +0000 (17:47 -0700)]
Add direct rendering for border
bug:
8603245
Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
Baligh Uddin [Fri, 12 Apr 2013 23:49:11 +0000 (16:49 -0700)]
am
c47dc315: am
ced505a6: am
b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
c47dc315e74eb6a505faa22072b3cabe1ec5282d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:42:18 +0000 (16:42 -0700)]
am
ced505a6: am
b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
ced505a6a7364b8623849354aa3f3134bad35830':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:42:15 +0000 (16:42 -0700)]
am
859a2ae9: am
6b4c389d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
859a2ae99f0c6f3c62fdd37fde8f8800a463ea28':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:38:28 +0000 (16:38 -0700)]
am
6b4c389d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
6b4c389d201cd87e49699995a8ee4d68d68af37e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:38:03 +0000 (16:38 -0700)]
am
b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
b9db2d6aeb5b3b1d6a2335509de14612ce4453c3':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Apr 2013 23:35:00 +0000 (23:35 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 12 Apr 2013 23:34:18 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 12 Apr 2013 23:34:05 +0000 (23:34 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Bart Sears [Fri, 12 Apr 2013 21:35:20 +0000 (14:35 -0700)]
am
fe0eeedd: am
cadaa899: am
4772792d: Bump up the version number to 1.1.40010
* commit '
fe0eeedd664f41112bdd76ee1414ca387a62e21b':
Bump up the version number to 1.1.40010
Bart Sears [Fri, 12 Apr 2013 21:31:24 +0000 (14:31 -0700)]
am
cadaa899: am
4772792d: Bump up the version number to 1.1.40010
* commit '
cadaa89992808a8fca782e24f2c42c17d07dac1b':
Bump up the version number to 1.1.40010
Bart Sears [Fri, 12 Apr 2013 21:28:00 +0000 (14:28 -0700)]
am
4772792d: Bump up the version number to 1.1.40010
* commit '
4772792dbe4a29bd90139eead6a881f47523ede5':
Bump up the version number to 1.1.40010
Bart Sears [Fri, 12 Apr 2013 20:48:58 +0000 (13:48 -0700)]
Bump up the version number to 1.1.40010
Bug:
8607157
Change-Id: I4c0f4cd481d0989cad2fd9cadbda9f7768b81765
nicolasroard [Fri, 12 Apr 2013 20:26:10 +0000 (13:26 -0700)]
am
951d74d2: am
439b028e: am
93ef658b: Add a direct rendering mode
* commit '
951d74d281abd98bb3846caacd5050f197670d8f':
Add a direct rendering mode
nicolasroard [Fri, 12 Apr 2013 20:22:33 +0000 (13:22 -0700)]
am
439b028e: am
93ef658b: Add a direct rendering mode
* commit '
439b028e7a74bbc56b96d43c2e58f1679207be7b':
Add a direct rendering mode
nicolasroard [Fri, 12 Apr 2013 20:18:45 +0000 (13:18 -0700)]
am
93ef658b: Add a direct rendering mode
* commit '
93ef658bf44d7ecd79894a9a225a400c2741058f':
Add a direct rendering mode
nicolasroard [Thu, 11 Apr 2013 02:27:57 +0000 (19:27 -0700)]
Add a direct rendering mode
This takes input and output allocations.
Also added a utility method in ImageFilterRS
to scale textures at screen resolution.
bug:
8603245
bug:
8588853
Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
Michael Kolb [Fri, 12 Apr 2013 17:04:32 +0000 (10:04 -0700)]
am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e':
Add checks for NPE in video pie menu.
Baligh Uddin [Fri, 12 Apr 2013 18:21:28 +0000 (11:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia8295be72b66a5eacb395f8ffc55878ab03ebc79
Auto-generated-cl: translation import
Baligh Uddin [Fri, 12 Apr 2013 18:20:51 +0000 (11:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I985fe436b0d183ed5aa36a3a9db826be010fb97b
Auto-generated-cl: translation import
Baligh Uddin [Fri, 12 Apr 2013 18:20:18 +0000 (11:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib9a794dd416ad278849b4a0900307f0fbdd8f927
Auto-generated-cl: translation import
Michael Kolb [Fri, 12 Apr 2013 17:38:32 +0000 (10:38 -0700)]
am
c2e1a167: am
fb4605d7: am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
c2e1a167f4a128c13445406d7087ebead2a262b7':
Add checks for NPE in video pie menu.
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
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
Michael Kolb [Fri, 12 Apr 2013 17:10:09 +0000 (10:10 -0700)]
am
fb4605d7: am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
fb4605d780396f5e6c4e5043985b460e24308758':
Add checks for NPE in video pie menu.
Michael Kolb [Fri, 12 Apr 2013 17:04:32 +0000 (10:04 -0700)]
am
bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
* commit '
bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e':
Add checks for NPE in video pie menu.
Michael Kolb [Fri, 12 Apr 2013 17:00:38 +0000 (17:00 +0000)]
Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
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
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
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
Michael Kolb [Fri, 12 Apr 2013 16:51:57 +0000 (16:51 +0000)]
Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
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
Doris Liu [Fri, 12 Apr 2013 16:47:05 +0000 (16:47 +0000)]
Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
Michael Kolb [Fri, 12 Apr 2013 15:45:25 +0000 (08:45 -0700)]
Fix NPE in PieRenderer
Bug:
8579025
Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
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.
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.
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.
Ruben Brunk [Fri, 12 Apr 2013 01:01:25 +0000 (18:01 -0700)]
G+ crop overlay shadows. Aspect ratios.
Bug:
8597538
Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909
Jason Noguchi [Fri, 12 Apr 2013 00:39:20 +0000 (17:39 -0700)]
Add checks for NPE in video pie menu.
Bug:
8536361
Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
Doris Liu [Wed, 10 Apr 2013 18:52:40 +0000 (11:52 -0700)]
Fix ICS recording aspect ratio
Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0
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
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
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
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.
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
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.
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
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.
Angus Kong [Thu, 11 Apr 2013 22:42:12 +0000 (22:42 +0000)]
Merge "Integrate FilmStripView." into gb-ub-photos-bryce
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.
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.
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.
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.
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
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.
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.
Ruben Brunk [Thu, 11 Apr 2013 19:39:03 +0000 (12:39 -0700)]
Setup geometry xforms and propogation chain.
Bug:
8597538
Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388
Angus Kong [Tue, 9 Apr 2013 22:02:59 +0000 (15:02 -0700)]
Integrate FilmStripView.
Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
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
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
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
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
Doris Liu [Thu, 11 Apr 2013 17:07:25 +0000 (17:07 +0000)]
Merge "Fix camera preview being squished" into gb-ub-photos-bryce
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':
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
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
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.
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.
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.
Ruben Brunk [Thu, 11 Apr 2013 00:27:33 +0000 (17:27 -0700)]
Fix downsampling check in crop.
Bug:
8586301
Change-Id: I4c5441f779122adb984368609cfea39a60190848
Doris Liu [Wed, 10 Apr 2013 23:43:43 +0000 (16:43 -0700)]
Fix camera preview being squished
Bug:
8585407
Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd
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
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
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
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
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
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
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
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
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
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
Baligh Uddin [Wed, 10 Apr 2013 19:58:35 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 10 Apr 2013 19:58:23 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 10 Apr 2013 19:58:12 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 10 Apr 2013 19:57:48 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 10 Apr 2013 19:57:38 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 10 Apr 2013 19:57:27 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
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
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
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