OSDN Git Service
Owen Lin [Fri, 11 Nov 2011 23:59:17 +0000 (15:59 -0800)]
am
fa0af693: resolved conflicts for merge of
64d592c0 to master
* commit '
fa0af6939e716e8ad07ca9200fbe665d165aefda':
Request sync when opening Gallery/Album.
Owen Lin [Fri, 11 Nov 2011 23:59:15 +0000 (15:59 -0800)]
am
4001b59b: am
d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1
* commit '
4001b59bc073c674bffa10b32d9c53654888ce37':
Show control overlay when earphone is unplugged
Yuli Huang [Fri, 11 Nov 2011 23:59:15 +0000 (15:59 -0800)]
am
a6e4e6a8: am
e193bc40: Merge "Fix b/
5518211 by disabling effects when photo cannot be loaded." into ics-mr1
* commit '
a6e4e6a8709cd3c0ba4f594015e4a9e50ab2b282':
Fix b/
5518211 by disabling effects when photo cannot be loaded.
Chih-Chung Chang [Fri, 11 Nov 2011 23:59:14 +0000 (15:59 -0800)]
am
aa6bce7d: am
b86c6aa0: Fix
5548567: Don\'t play video immediately.
* commit '
aa6bce7d890ce47eb4cae2fef45ea307661bfd07':
Fix
5548567: Don't play video immediately.
Owen Lin [Fri, 11 Nov 2011 10:17:26 +0000 (18:17 +0800)]
resolved conflicts for merge of
64d592c0 to master
Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
Owen Lin [Fri, 11 Nov 2011 06:36:40 +0000 (06:36 +0000)]
am
d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1
* commit '
d80bb5974b0ec43ca1755aff4287fc7815504058':
Show control overlay when earphone is unplugged
Yuli Huang [Fri, 11 Nov 2011 06:36:40 +0000 (06:36 +0000)]
am
e193bc40: Merge "Fix b/
5518211 by disabling effects when photo cannot be loaded." into ics-mr1
* commit '
e193bc40110b0606806c864234e95141be6bd312':
Fix b/
5518211 by disabling effects when photo cannot be loaded.
Chih-Chung Chang [Fri, 11 Nov 2011 06:36:39 +0000 (06:36 +0000)]
am
b86c6aa0: Fix
5548567: Don\'t play video immediately.
* commit '
b86c6aa085a66ffee2a178f4b5e2426cc67ca90b':
Fix
5548567: Don't play video immediately.
Owen Lin [Fri, 11 Nov 2011 06:34:30 +0000 (22:34 -0800)]
Merge "Request sync when opening Gallery/Album." into ics-mr1
Owen Lin [Fri, 11 Nov 2011 06:33:16 +0000 (22:33 -0800)]
Merge "Show control overlay when earphone is unplugged" into ics-mr1
Owen Lin [Fri, 11 Nov 2011 04:01:09 +0000 (12:01 +0800)]
Show control overlay when earphone is unplugged
Change-Id: I3e259e66d318010a3f9e9b47b561a09b2db2b6a5
fix:
5563251
Yuli Huang [Fri, 11 Nov 2011 02:58:20 +0000 (18:58 -0800)]
Merge "Fix b/
5518211 by disabling effects when photo cannot be loaded." into ics-mr1
Owen Lin [Tue, 8 Nov 2011 11:05:56 +0000 (19:05 +0800)]
Request sync when opening Gallery/Album.
fix:
5519437
Change-Id: I0fb60415e3a92a677ca72ee8e0b95ae57e802152
Eric Fischer [Thu, 10 Nov 2011 23:04:07 +0000 (23:04 +0000)]
am
bfdc2058: Merge "Import revised translations."
* commit '
bfdc2058f52c6ad3a5ee03ea7ee2a70321260dc2':
Import revised translations.
Eric Fischer [Thu, 10 Nov 2011 23:01:57 +0000 (15:01 -0800)]
Merge "Import revised translations."
The Android Open Source Project [Thu, 10 Nov 2011 22:38:58 +0000 (22:38 +0000)]
am
ab22eb35: Reconcile with ics-mr1-release
* commit '
ab22eb356188c58f2f91f2ddc6e3abed3fcc9740':
The Android Open Source Project [Thu, 10 Nov 2011 22:36:29 +0000 (14:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7af0b572fb36c3c93761232c46d9adf74da8aacd
Eric Fischer [Thu, 10 Nov 2011 22:12:56 +0000 (14:12 -0800)]
Import revised translations.
Change-Id: I34e26a60238c1a846f6f9a327db7b892737539cf
Chih-Chung Chang [Thu, 10 Nov 2011 18:53:46 +0000 (18:53 +0000)]
am
99a10821: am
af92c510: Merge "Fix
5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
* commit '
99a1082122e040ff07fa2c044efd6d42c2450a75':
Fix
5585254: Make system UI enter "low profile mode" while playing.
Chih-Chung Chang [Thu, 10 Nov 2011 18:51:13 +0000 (18:51 +0000)]
am
af92c510: Merge "Fix
5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
* commit '
af92c5100158fe39cca21abb76ca685bfe106eeb':
Fix
5585254: Make system UI enter "low profile mode" while playing.
The Android Automerger [Thu, 10 Nov 2011 14:47:10 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Thu, 10 Nov 2011 10:01:33 +0000 (18:01 +0800)]
Fix
5548567: Don't play video immediately.
Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1
Yuli Huang [Thu, 10 Nov 2011 08:50:31 +0000 (16:50 +0800)]
Fix b/
5518211 by disabling effects when photo cannot be loaded.
Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
Ray Chen [Thu, 10 Nov 2011 07:03:34 +0000 (07:03 +0000)]
am
30ba9e02: Merge "Fix
5453262 No pictures / Videos available in Gallery message not displayed"
* commit '
30ba9e029978705598b4cf2427b5d21a4c608e53':
Fix
5453262 No pictures / Videos available in Gallery message not displayed
Ray Chen [Thu, 10 Nov 2011 07:01:49 +0000 (23:01 -0800)]
Merge "Fix
5453262 No pictures / Videos available in Gallery message not displayed"
Yuli Huang [Thu, 10 Nov 2011 05:46:25 +0000 (05:46 +0000)]
am
26c6002b: am
8cfe549a: Fix b/
5587210: Add file extension to display-name.
* commit '
26c6002bd211cf85b1049bcb6b26006a1496ac36':
Fix b/
5587210: Add file extension to display-name.
Yuli Huang [Thu, 10 Nov 2011 05:42:56 +0000 (05:42 +0000)]
am
8cfe549a: Fix b/
5587210: Add file extension to display-name.
* commit '
8cfe549a3c6e50653ce50cedf90e8463d641987d':
Fix b/
5587210: Add file extension to display-name.
Chih-Chung Chang [Thu, 10 Nov 2011 04:17:38 +0000 (20:17 -0800)]
Merge "Fix
5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
Yuli Huang [Thu, 10 Nov 2011 01:15:08 +0000 (01:15 +0000)]
am
5ba2576d: am
90b7a7a1: Fix b/
5510870 by persisting states of save/share buttons.
* commit '
5ba2576ddcc315822100bdd904ea42a6bebce9e3':
Fix b/
5510870 by persisting states of save/share buttons.
Yuli Huang [Thu, 10 Nov 2011 01:11:46 +0000 (01:11 +0000)]
am
90b7a7a1: Fix b/
5510870 by persisting states of save/share buttons.
* commit '
90b7a7a1fed287cab3500acdfaf4e82ec0a59dec':
Fix b/
5510870 by persisting states of save/share buttons.
Yuli Huang [Wed, 9 Nov 2011 18:10:10 +0000 (02:10 +0800)]
Fix b/
5587210: Add file extension to display-name.
Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481
The Android Automerger [Wed, 9 Nov 2011 18:06:23 +0000 (10:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 9 Nov 2011 14:47:40 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Yuli Huang [Wed, 9 Nov 2011 14:37:25 +0000 (14:37 +0000)]
am
19df0dc8: am
738e82e1: Fix b/
5510870 by saving/restoring Activity states.
* commit '
19df0dc8551b9f363a5592ec07e8e4485ffc92b7':
Fix b/
5510870 by saving/restoring Activity states.
Yuli Huang [Wed, 9 Nov 2011 14:36:38 +0000 (14:36 +0000)]
am
1ece82da: am
13105e73: Merge "Add face tanning effect to gallery" into ics-mr1
* commit '
1ece82dacd5f2a527bb89a637d860332d27c78df':
Add face tanning effect to gallery
Yuli Huang [Wed, 9 Nov 2011 14:34:20 +0000 (14:34 +0000)]
am
738e82e1: Fix b/
5510870 by saving/restoring Activity states.
* commit '
738e82e163f90e1fe7aeef8bd153dc7763631f30':
Fix b/
5510870 by saving/restoring Activity states.
Chih-Chung Chang [Wed, 9 Nov 2011 12:57:53 +0000 (20:57 +0800)]
Fix
5585254: Make system UI enter "low profile mode" while playing.
Change-Id: I91f680871b7a965f6776cb017dcd825a587e5054
Yuli Huang [Wed, 9 Nov 2011 07:10:45 +0000 (15:10 +0800)]
Fix b/
5510870 by persisting states of save/share buttons.
Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6
Ray Chen [Wed, 9 Nov 2011 08:13:19 +0000 (16:13 +0800)]
Fix
5453262 No pictures / Videos available in Gallery message not displayed
Change-Id: Ib6c8691e4206f9d6a07a7587d22a67c1a21bc5a5
Yuli Huang [Tue, 8 Nov 2011 18:49:14 +0000 (18:49 +0000)]
am
13105e73: Merge "Add face tanning effect to gallery" into ics-mr1
* commit '
13105e73298f7ed0031232d48a7cf43ac4c0d21f':
Add face tanning effect to gallery
Yuli Huang [Fri, 4 Nov 2011 08:39:50 +0000 (16:39 +0800)]
Fix b/
5510870 by saving/restoring Activity states.
1. Filters implement Parcelable for saving/restoring states.
2. Extract Doodle for making doodling paths parcelable.
Change-Id: Ice8e6e068891da8a8f9251e62d95ea755fa99933
The Android Automerger [Tue, 8 Nov 2011 14:46:22 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Yuli Huang [Tue, 8 Nov 2011 03:58:36 +0000 (19:58 -0800)]
Merge "Add face tanning effect to gallery" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:43:09 +0000 (20:43 +0000)]
am
3eeb824f: am
826c44f2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
3eeb824faa141fa2fed26faf88ba0e446595c682':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Nov 2011 20:41:00 +0000 (20:41 +0000)]
am
826c44f2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Nov 2011 20:36:26 +0000 (12:36 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:26:25 +0000 (12:26 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I60c0c0e36909fdad936f20880904a18ccddb503c
Wei Huang [Mon, 7 Nov 2011 18:59:34 +0000 (18:59 +0000)]
am
b7bacbd5: am
e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1
* commit '
b7bacbd5a7f487bd232c69bb1eebdb4a038c930d':
Change OK to CROP fro CropImage.
Wei Huang [Mon, 7 Nov 2011 18:57:34 +0000 (18:57 +0000)]
am
e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1
* commit '
e9560e6c7bc55718c46264ac03eb7b44bfc857f2':
Change OK to CROP fro CropImage.
Wei Huang [Mon, 7 Nov 2011 18:54:46 +0000 (10:54 -0800)]
Merge "Change OK to CROP fro CropImage." into ics-mr1
Chih-Chung Chang [Mon, 7 Nov 2011 18:35:51 +0000 (18:35 +0000)]
am
ebcdca0c: am
d6985f9b: Fix
5457600: In UriImage, read exif to determine orientation.
* commit '
ebcdca0c0d2a98705600f5bcc736d64e96a906e7':
Fix
5457600: In UriImage, read exif to determine orientation.
Chih-Chung Chang [Mon, 7 Nov 2011 18:34:30 +0000 (18:34 +0000)]
am
d6985f9b: Fix
5457600: In UriImage, read exif to determine orientation.
* commit '
d6985f9ba58c11c29760f28be07ebd229a9b7a39':
Fix
5457600: In UriImage, read exif to determine orientation.
The Android Open Source Project [Mon, 7 Nov 2011 16:34:45 +0000 (16:34 +0000)]
am
a6d87487: Reconcile with ics-mr1-release
* commit '
a6d8748786f2662e93ecc6be7e016613052f85cf':
The Android Open Source Project [Mon, 7 Nov 2011 16:31:56 +0000 (08:31 -0800)]
Reconcile with ics-mr1-release
Change-Id: I0eb3a8338e095504809785f4f9ff15c0e8fc7329
Owen Lin [Mon, 7 Nov 2011 10:09:51 +0000 (18:09 +0800)]
Change OK to CROP fro CropImage.
fix:
5199444
Change-Id: I8ee74ba371c5537d7b86d771a202e0ac40668dfc
The Android Automerger [Sun, 6 Nov 2011 14:46:37 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Mon, 24 Oct 2011 11:46:07 +0000 (19:46 +0800)]
Fix
5457600: In UriImage, read exif to determine orientation.
Change-Id: Iacc5c52747a4ed4dd8f6cab48ce784aff907525b
Ruei-sung Lin [Fri, 14 Oct 2011 01:20:07 +0000 (18:20 -0700)]
Add face tanning effect to gallery
bug:
5453164
Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c
The Android Open Source Project [Fri, 4 Nov 2011 15:33:20 +0000 (15:33 +0000)]
am
7f7cbdfc: Reconcile with ics-mr1-release
* commit '
7f7cbdfc2654121a3be8605f2d5dcf3011a025a5':
Fix
5556160 Crash in gallery after playing slideshow Crespo IML33B.
The Android Open Source Project [Fri, 4 Nov 2011 15:31:35 +0000 (08:31 -0700)]
Reconcile with ics-mr1-release
Change-Id: Ic37b4c137bcb0afe35a796aa8538ba50a8a7fb19
Ray Chen [Thu, 3 Nov 2011 07:47:38 +0000 (15:47 +0800)]
Fix
5556160 Crash in gallery after playing slideshow Crespo IML33B.
Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9
Wei Huang [Thu, 3 Nov 2011 18:56:02 +0000 (18:56 +0000)]
am
07b88daa: am
529f5341: Merge "Fix
5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1
* commit '
07b88daac3a120fdbbf893b3da4a0a27ebf00aaa':
Fix
5556160 Crash in gallery after playing slideshow Crespo IML33B.
Wei Huang [Thu, 3 Nov 2011 18:53:28 +0000 (18:53 +0000)]
am
529f5341: Merge "Fix
5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1
* commit '
529f53415f34835a32105a73a23f7aa94c5a7e16':
Fix
5556160 Crash in gallery after playing slideshow Crespo IML33B.
Wei Huang [Thu, 3 Nov 2011 18:48:49 +0000 (11:48 -0700)]
Merge "Fix
5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1
Chih-Chung Chang [Thu, 3 Nov 2011 16:45:09 +0000 (16:45 +0000)]
am
9c6cc324: am
cc2f8c4e: Merge "Fix
5543077: Gallery UI tweaks." into ics-mr1
* commit '
9c6cc3247c5d22d70c716ac5627f0d53222779fa':
Fix
5543077: Gallery UI tweaks.
Chih-Chung Chang [Thu, 3 Nov 2011 16:43:42 +0000 (16:43 +0000)]
am
cc2f8c4e: Merge "Fix
5543077: Gallery UI tweaks." into ics-mr1
* commit '
cc2f8c4e24a9cd8fcf99e960f0148a57128b6133':
Fix
5543077: Gallery UI tweaks.
Chih-Chung Chang [Thu, 3 Nov 2011 16:40:39 +0000 (09:40 -0700)]
Merge "Fix
5543077: Gallery UI tweaks." into ics-mr1
Chih-Chung Chang [Thu, 3 Nov 2011 16:27:50 +0000 (16:27 +0000)]
am
acfc53ba: am
1a9b69fb: Merge "
3252698: Make drawing target 60fps." into ics-mr1
* commit '
acfc53ba3422e1c78e3c78c47b3fe94681126037':
3252698: Make drawing target 60fps.
Chih-Chung Chang [Thu, 3 Nov 2011 16:26:02 +0000 (16:26 +0000)]
am
1a9b69fb: Merge "
3252698: Make drawing target 60fps." into ics-mr1
* commit '
1a9b69fbc17263e00aa138dde0c52b37fab6766b':
3252698: Make drawing target 60fps.
Chih-Chung Chang [Thu, 3 Nov 2011 16:19:40 +0000 (09:19 -0700)]
Merge "
3252698: Make drawing target 60fps." into ics-mr1
The Android Automerger [Thu, 3 Nov 2011 13:44:37 +0000 (06:44 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Chih-Chung Chang [Thu, 3 Nov 2011 11:25:58 +0000 (19:25 +0800)]
Fix
5543077: Gallery UI tweaks.
Change-Id: I0b85b37ba851628acd0853e4de0985b494606487
Ray Chen [Thu, 3 Nov 2011 10:23:37 +0000 (10:23 +0000)]
am
cb0b8f97: am
da9f0c77: Merge "Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1
* commit '
cb0b8f974fb97582b0b37458ec599226b5fb8f92':
Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
Ray Chen [Thu, 3 Nov 2011 10:23:37 +0000 (10:23 +0000)]
am
e2f9aaf5: am
eda8303b: Merge "Fix
5511057 Action bar UI is broken when sorting within an album" into ics-mr1
* commit '
e2f9aaf5fa564decd9ad9a1e95ac48c6d9e5d447':
Fix
5511057 Action bar UI is broken when sorting within an album
Ray Chen [Thu, 3 Nov 2011 10:22:36 +0000 (10:22 +0000)]
am
da9f0c77: Merge "Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1
* commit '
da9f0c773aa6c9ba228f30811df35d2c601dfdb6':
Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
Ray Chen [Thu, 3 Nov 2011 10:22:36 +0000 (10:22 +0000)]
am
eda8303b: Merge "Fix
5511057 Action bar UI is broken when sorting within an album" into ics-mr1
* commit '
eda8303bebf12f60edf15a2abbc08b99a7c35eef':
Fix
5511057 Action bar UI is broken when sorting within an album
Ray Chen [Thu, 3 Nov 2011 10:04:14 +0000 (03:04 -0700)]
Merge "Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1
Ray Chen [Thu, 3 Nov 2011 10:03:43 +0000 (03:03 -0700)]
Merge "Fix
5511057 Action bar UI is broken when sorting within an album" into ics-mr1
Ray Chen [Thu, 3 Nov 2011 07:47:38 +0000 (15:47 +0800)]
Fix
5556160 Crash in gallery after playing slideshow Crespo IML33B.
Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9
Chih-Chung Chang [Thu, 3 Nov 2011 04:21:58 +0000 (12:21 +0800)]
3252698: Make drawing target 60fps.
Change-Id: I5dbff93713422e49378b8e215cac8b7f749ef38a
Owen Lin [Thu, 3 Nov 2011 02:27:57 +0000 (02:27 +0000)]
am
5673af6e: am
a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1
* commit '
5673af6e9f89a910ad7a0f562c2ded098203c1cf':
Add cover image to MediaSet.
Owen Lin [Thu, 3 Nov 2011 02:26:35 +0000 (02:26 +0000)]
am
a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1
* commit '
a98d3c4dbed84296496f5f710bd1289d735581d5':
Add cover image to MediaSet.
Owen Lin [Thu, 3 Nov 2011 02:24:27 +0000 (19:24 -0700)]
Merge "Add cover image to MediaSet." into ics-mr1
Eric Fischer [Thu, 3 Nov 2011 00:45:55 +0000 (00:45 +0000)]
am
aee7fdda: am
e617b945: (-s ours) am
82635d92: (-s ours) Import revised translations. DO NOT MERGE
* commit '
aee7fddaebbcdede0d5bf1d584bcf51fcc01efa1':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 3 Nov 2011 00:43:25 +0000 (00:43 +0000)]
am
e617b945: (-s ours) am
82635d92: (-s ours) Import revised translations. DO NOT MERGE
* commit '
e617b945b25f0034ff3136457b32bfe39b6d3e08':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 3 Nov 2011 00:04:24 +0000 (00:04 +0000)]
am
82635d92: (-s ours) Import revised translations. DO NOT MERGE
* commit '
82635d92bc0f2186da650a00fa458d1c542e2ec9':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Nov 2011 22:17:50 +0000 (15:17 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I6d64dfa6b24c8fdf56138637208d7e66ae95b7b2
Eric Fischer [Wed, 2 Nov 2011 21:16:40 +0000 (21:16 +0000)]
am
b72d2ab3: Merge "Import revised translations."
* commit '
b72d2ab3c47b9093235e1f5f93ac6fddc104df9c':
Import revised translations.
Eric Fischer [Wed, 2 Nov 2011 21:13:37 +0000 (14:13 -0700)]
Merge "Import revised translations."
Ray Chen [Wed, 2 Nov 2011 17:58:43 +0000 (17:58 +0000)]
am
a368e458: am
c0c13c38: Merge "Fix
5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1
* commit '
a368e458166dd853c8df956e6b4f8b3f38d3183d':
Fix
5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
Eric Fischer [Wed, 2 Nov 2011 17:52:53 +0000 (17:52 +0000)]
am
35adc6e2: (-s ours) am
d1e3e976: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
35adc6e2b37ce47744a248f4cf4aa041e1400161':
Import revised translations. DO NOT MERGE
Ray Chen [Wed, 2 Nov 2011 17:50:34 +0000 (17:50 +0000)]
am
c0c13c38: Merge "Fix
5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1
* commit '
c0c13c38c8e4e86689f4989ca268f71cbb46bff0':
Fix
5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
Eric Fischer [Wed, 2 Nov 2011 17:31:30 +0000 (17:31 +0000)]
am
d1e3e976: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
d1e3e97606b850022cced61bafb50a1989b76d15':
Import revised translations. DO NOT MERGE
Chih-Chung Chang [Wed, 2 Nov 2011 17:29:41 +0000 (17:29 +0000)]
am
6fb1ddf5: Merge "Fix
5533861: Correct the thumbnail area hit testing calculation." into ics-mr1
* commit '
6fb1ddf56809a3eedfc36cb4c2ea56e0010bbaba':
Fix
5533861: Correct the thumbnail area hit testing calculation.
Chih-Chung Chang [Wed, 2 Nov 2011 17:29:37 +0000 (17:29 +0000)]
am
4c89478b: Fix
5514384: add video/avi as a supported mime type.
* commit '
4c89478bfcea7a9b9f6ccc45594b472735e04f56':
Fix
5514384: add video/avi as a supported mime type.
Eric Fischer [Wed, 2 Nov 2011 17:22:58 +0000 (10:22 -0700)]
Import revised translations.
Change-Id: Iabba637909aec27731a7a991b3b8540da1c9b957
The Android Automerger [Wed, 2 Nov 2011 13:46:36 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Ray Chen [Wed, 2 Nov 2011 09:43:07 +0000 (02:43 -0700)]
Merge "Fix
5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo" into ics-mr1
Ray Chen [Wed, 2 Nov 2011 09:42:43 +0000 (02:42 -0700)]
Merge "Fix
5453262 No pictures / Videos available in Gallery message not displayed"
Eric Fischer [Tue, 1 Nov 2011 20:51:51 +0000 (13:51 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
OSDN Git Service
