OSDN Git Service
Ray Chen [Thu, 3 Nov 2011 10:21:08 +0000 (10:21 +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:21:07 +0000 (10:21 +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
Owen Lin [Thu, 3 Nov 2011 02:26:13 +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:10:11 +0000 (00:10 +0000)]
am
e617b945: 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
Ray Chen [Wed, 2 Nov 2011 09:44:46 +0000 (09:44 +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
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
Eric Fischer [Tue, 1 Nov 2011 20:55:28 +0000 (20:55 +0000)]
am
d1e3e976: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
d1e3e97606b850022cced61bafb50a1989b76d15':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Nov 2011 20:51:51 +0000 (13:51 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:36:36 +0000 (13:36 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib482395eb51431bb5c3f87f27c98f83f3281a88f
Owen Lin [Thu, 27 Oct 2011 13:24:21 +0000 (21:24 +0800)]
Add cover image to MediaSet.
fix:
5519437
So that subclass can has its own definition on albums' cover.
Change-Id: Idf2f89933291bedf02054b9488acffe4bd68b1b3
Chih-Chung Chang [Tue, 1 Nov 2011 02:36:30 +0000 (02:36 +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 [Tue, 1 Nov 2011 02:34:36 +0000 (19:34 -0700)]
Merge "Fix
5533861: Correct the thumbnail area hit testing calculation." into ics-mr1
Chih-Chung Chang [Tue, 1 Nov 2011 02:23:32 +0000 (02:23 +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.
Ed Heyl [Mon, 31 Oct 2011 12:54:47 +0000 (05:54 -0700)]
Merge remote branch 'goog/ics-mr1' into ics-aah
Chih-Chung Chang [Mon, 31 Oct 2011 03:45:11 +0000 (11:45 +0800)]
Fix
5533861: Correct the thumbnail area hit testing calculation.
Change-Id: I3a9229497c955628cb49c42c0ee02c41eaadd705
Chih-Chung Chang [Mon, 31 Oct 2011 03:23:43 +0000 (11:23 +0800)]
Fix
5514384: add video/avi as a supported mime type.
Change-Id: I197711a1ef0f5b6356573944c3012c6a14905579
Eric Fischer [Sat, 29 Oct 2011 03:15:31 +0000 (03:15 +0000)]
am
8e10103f: (-s ours) Import revised translations. DO NOT MERGE
* commit '
8e10103fa8010a6756182a9a14c7504254dda36a':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Oct 2011 00:05:39 +0000 (17:05 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I838ee08834a0ab535519aa5886fb8593e49f59fc
Eric Fischer [Fri, 28 Oct 2011 21:00:52 +0000 (14:00 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 20:53:13 +0000 (13:53 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I76f98594896d654584cfa3d75a56264906837e46
Ed Heyl [Fri, 28 Oct 2011 19:05:56 +0000 (19:05 +0000)]
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
Ray Chen [Fri, 28 Oct 2011 04:01:49 +0000 (12:01 +0800)]
Fix
5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
Change-Id: Icd160f688496c5e9e70c13889e9e393cad0dc428
Eric Fischer [Thu, 27 Oct 2011 21:46:48 +0000 (21:46 +0000)]
am
cceae7e7: (-s ours) Import revised translations. DO NOT MERGE
* commit '
cceae7e79d7a795c6007170c174930061e0654a7':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 16:52:22 +0000 (09:52 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I67c4dc34f67192f714172fbc5a82ff7cb8b81ff2
Eric Fischer [Thu, 27 Oct 2011 16:45:19 +0000 (09:45 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Ray Chen [Fri, 21 Oct 2011 08:07:12 +0000 (16:07 +0800)]
Fix
5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
Change-Id: I2ed78cee2f6257254794a7724897845c43a3e0a5
Ray Chen [Wed, 26 Oct 2011 03:36:55 +0000 (11:36 +0800)]
Fix
5511057 Action bar UI is broken when sorting within an album
Change-Id: I1b2d22b2fae8b20f03a761696ba1e2c5665d282b
Chih-Chung Chang [Thu, 27 Oct 2011 03:27:26 +0000 (11:27 +0800)]
Fix
5516359: Not able to share video to YouTube when the video is playing.
YouTube needs a content URI to share.
Change-Id: I7088c11d9d5a0b97bbb6de4ca72d4cc097f9a03c
Eric Fischer [Thu, 27 Oct 2011 00:40:16 +0000 (17:40 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ie311a298b5510a50728d61117a3855a866291ca4
Ed Heyl [Wed, 26 Oct 2011 21:53:26 +0000 (21:53 +0000)]
undo reset to ics-mr1 until we have a better method
Eric Fischer [Wed, 26 Oct 2011 21:08:54 +0000 (21:08 +0000)]
am
0e711f17: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
0e711f17ec4252457453f8b9507aabc2a886d6d6':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 21:05:37 +0000 (14:05 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Ed Heyl [Wed, 26 Oct 2011 18:50:24 +0000 (18:50 +0000)]
reset to ics-mr1, but keep history
Eric Fischer [Wed, 26 Oct 2011 18:29:21 +0000 (11:29 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 26 Oct 2011 18:07:45 +0000 (11:07 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I078484fe3bb63f021b35d935e864604681265fe4
Yuli Huang [Wed, 26 Oct 2011 17:38:15 +0000 (10:38 -0700)]
am
d0817e2d: am
b1ac0614: am
f66bd12b: Fix b/
5501285 by ensuring bitmap in ARGB8888 format.
* commit '
d0817e2d5027e71a99c8e0e9186c261f414d821c':
Fix b/
5501285 by ensuring bitmap in ARGB8888 format.
Yuli Huang [Wed, 26 Oct 2011 17:36:50 +0000 (17:36 +0000)]
am
b1ac0614: am
f66bd12b: Fix b/
5501285 by ensuring bitmap in ARGB8888 format.
* commit '
b1ac0614afa725aa1bd759fb681d853983b2f1fb':
Fix b/
5501285 by ensuring bitmap in ARGB8888 format.
Yuli Huang [Wed, 26 Oct 2011 17:34:03 +0000 (17:34 +0000)]
am
f66bd12b: Fix b/
5501285 by ensuring bitmap in ARGB8888 format.
* commit '
f66bd12b33e0d590e192a3551e9affc55eef9a48':
Fix b/
5501285 by ensuring bitmap in ARGB8888 format.
Eric Fischer [Wed, 26 Oct 2011 17:21:43 +0000 (10:21 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I4da74b8d117cfc2336730179daa364b800e73f23
Yuli Huang [Wed, 26 Oct 2011 12:10:06 +0000 (20:10 +0800)]
Fix b/
5501285 by ensuring bitmap in ARGB8888 format.
Change-Id: I48ece547543207ba92276962fc6131859f615313
Ed Heyl [Wed, 26 Oct 2011 15:00:37 +0000 (08:00 -0700)]
am
d9598402: am
2015a3c3: Merge remote branch \'goog/ics-mr0\' into ics-mr1
* commit '
d9598402bf73dabbb4d342c1a2ac72dbdf482a8f':
Ed Heyl [Wed, 26 Oct 2011 14:57:59 +0000 (14:57 +0000)]
am
2015a3c3: Merge remote branch \'goog/ics-mr0\' into ics-mr1
* commit '
2015a3c36930045d6268871e9c6907533d863702':
Chih-Chung Chang [Wed, 26 Oct 2011 11:47:47 +0000 (04:47 -0700)]
am
a425add4: Merge "Fix
4083882: When scrolling repeatedly, the Gallery jumps."
* commit '
a425add4954b722e3913005c9045325a163a0c6b':
Fix
4083882: When scrolling repeatedly, the Gallery jumps.
Chih-Chung Chang [Wed, 26 Oct 2011 02:30:56 +0000 (19:30 -0700)]
Merge "Fix
4083882: When scrolling repeatedly, the Gallery jumps."
Ed Heyl [Tue, 25 Oct 2011 19:50:40 +0000 (19:50 +0000)]
Merge remote branch 'goog/ics-mr0' into ics-mr1
Eric Fischer [Tue, 25 Oct 2011 18:47:32 +0000 (11:47 -0700)]
am
0ec7397a: Merge "Import revised translations."
* commit '
0ec7397ad80f401996f5b5be7e765f93d8361614':
Import revised translations.
Eric Fischer [Tue, 25 Oct 2011 18:44:55 +0000 (11:44 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 25 Oct 2011 17:51:42 +0000 (10:51 -0700)]
Import revised translations.
Change-Id: I4ba6ad38f5924e8ed58d44ec5ffb303f5c5f7faa
Chih-Chung Chang [Tue, 25 Oct 2011 11:23:19 +0000 (19:23 +0800)]
Fix
4083882: When scrolling repeatedly, the Gallery jumps.
Change-Id: I1d69330c54d94e3f8917fa8e502cb5c244628a15
Chih-Chung Chang [Tue, 25 Oct 2011 06:57:15 +0000 (23:57 -0700)]
am
e0f3d0c0: Merge "Fix
5450241: Forget to support https HTTP live urls."
* commit '
e0f3d0c0754c90fccc717a88cd3a751cf6562275':
Fix
5450241: Forget to support https HTTP live urls.
Chih-Chung Chang [Tue, 25 Oct 2011 06:57:15 +0000 (23:57 -0700)]
am
94aadd78: Merge "Fix
5454748: Localize hardcoded folder names."
* commit '
94aadd7897dfdc418c7f80b2042f584121defcce':
Fix
5454748: Localize hardcoded folder names.
Chih-Chung Chang [Tue, 25 Oct 2011 06:55:46 +0000 (23:55 -0700)]
Merge "Fix
5450241: Forget to support https HTTP live urls."
Chih-Chung Chang [Tue, 25 Oct 2011 06:55:37 +0000 (23:55 -0700)]
Merge "Fix
5454748: Localize hardcoded folder names."
Eric Fischer [Tue, 25 Oct 2011 00:06:28 +0000 (17:06 -0700)]
am
a44f538f: (-s ours) am
5fcef11e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
a44f538f4f73c7a719a0e6ba9058acee8ddc6a53':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 25 Oct 2011 00:03:56 +0000 (17:03 -0700)]
am
5fcef11e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
5fcef11e93ea473c7abe63555d0124257e520d19':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 25 Oct 2011 00:02:22 +0000 (17:02 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Mon, 24 Oct 2011 23:50:03 +0000 (16:50 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9ad63e3c80298ad541519506d7164b49d84a5e30
Yuli Huang [Mon, 24 Oct 2011 19:48:25 +0000 (12:48 -0700)]
am
452dd579: am
e334568e: Fix b/
5500172: Remove unused face-tanning icon.
* commit '
452dd57981fd4ffd132fe5e3f3cbfe67f8ef9dd8':
Fix b/
5500172: Remove unused face-tanning icon.
Yuli Huang [Mon, 24 Oct 2011 19:46:16 +0000 (12:46 -0700)]
am
e334568e: Fix b/
5500172: Remove unused face-tanning icon.
* commit '
e334568eec58601254df46111a5fe1331b775e54':
Fix b/
5500172: Remove unused face-tanning icon.
Chih-Chung Chang [Mon, 24 Oct 2011 08:45:02 +0000 (16:45 +0800)]
Fix
5450241: Forget to support https HTTP live urls.
Change-Id: Ib8689a87e8cea4350c388e814807b6cef35fd381
Chih-Chung Chang [Mon, 24 Oct 2011 07:56:30 +0000 (15:56 +0800)]
Fix
5454748: Localize hardcoded folder names.
Change-Id: I91586d6f707a0352be6be524e848bd2c2dacab7e
Yuli Huang [Mon, 24 Oct 2011 06:38:25 +0000 (14:38 +0800)]
Fix b/
5500172: Remove unused face-tanning icon.
Change-Id: Ie25cd01df9a48c1c26e2403e42e58c5729b5238f
Eric Fischer [Fri, 21 Oct 2011 23:06:00 +0000 (16:06 -0700)]
am
7bdf5cc3: (-s ours) am
de3412c5: (-s ours) Import revised translations. DO NOT MERGE
* commit '
7bdf5cc3671ba866458eaa52ab41fe42bf2d7eda':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 23:02:26 +0000 (16:02 -0700)]
am
de3412c5: (-s ours) Import revised translations. DO NOT MERGE
* commit '
de3412c5161fb727dee8b305bc114ea8806643a9':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 21:39:09 +0000 (14:39 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ia9fc268cf6f18f3b963f4891062f5589e4bf5d45
Eric Fischer [Fri, 21 Oct 2011 21:03:33 +0000 (14:03 -0700)]
am
a2f8b42e: (-s ours) am
ac3a825b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
a2f8b42e7a1c9039dab4e03200ccb21aab088a18':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 20:59:13 +0000 (13:59 -0700)]
am
ac3a825b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
ac3a825b6e7072c33779968a7c2d8d36a1f37e6e':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 01:02:30 +0000 (18:02 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ieb1e402fd1f4caef7ec076b48a74666e5d215a75
Eric Fischer [Thu, 20 Oct 2011 18:36:57 +0000 (11:36 -0700)]
am
02480bb4: (-s ours) am
4e92cf0e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
02480bb4b213029eb01d1b4e04eab49c27c3be9a':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:34:25 +0000 (11:34 -0700)]
am
4e92cf0e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
4e92cf0e9c92bd497d7205f71139ef88bca57aca':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:31:49 +0000 (11:31 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Thu, 20 Oct 2011 18:12:16 +0000 (11:12 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I558df3af8ecafa5b45163c52ff174ee52b79e4c0
Yuli Huang [Thu, 20 Oct 2011 16:29:57 +0000 (09:29 -0700)]
Yuli Huang [Thu, 20 Oct 2011 16:28:07 +0000 (09:28 -0700)]
Yuli Huang [Thu, 20 Oct 2011 10:29:05 +0000 (18:29 +0800)]
Fix b/
5401109.
1. Add FlipView similar to existing RotateView.
2. Add flipPhoto() similar to existing rotatePhoto() in PhotoView, and
add setRenderToFlip() in RendererUtils.
3. Make FlipAction use FlipView/PhotoView similar to how RotateAction
uses RotateView/PhotoView.
Change-Id: I5642266adbc248c0b8eda48ddc29558ae9cbd21e
Owen Lin [Thu, 20 Oct 2011 07:23:56 +0000 (00:23 -0700)]
am
dba62bd5: am
a77f6c46: Fix the issue that cropping wrong region for protrait image.
* commit '
dba62bd578151ed135f7455cb26dd8126d0926f3':
Fix the issue that cropping wrong region for protrait image.
Owen Lin [Thu, 20 Oct 2011 07:22:40 +0000 (00:22 -0700)]
am
a77f6c46: Fix the issue that cropping wrong region for protrait image.
* commit '
a77f6c46815195c8a2a39c9539163ea3e8683b5d':
Fix the issue that cropping wrong region for protrait image.
Owen Lin [Wed, 19 Oct 2011 11:52:33 +0000 (19:52 +0800)]
Fix the issue that cropping wrong region for protrait image.
Change-Id: Iea7a3874eb7170f8cae943c00cf92669a92b0ae2
fix:
5470203
Ray Chen [Wed, 19 Oct 2011 20:37:09 +0000 (13:37 -0700)]
am
a67a9bc8: am
c0ba0936: Fix
5418759 User should be able to view only the preview of that attached
* commit '
a67a9bc86f1e1029fd69724480ab7e15e766f1f8':
Fix
5418759 User should be able to view only the preview of that attached
Ray Chen [Wed, 19 Oct 2011 20:35:20 +0000 (13:35 -0700)]
am
c0ba0936: Fix
5418759 User should be able to view only the preview of that attached
* commit '
c0ba0936bac7d56b92a409380c4d378ed2c272b0':
Fix
5418759 User should be able to view only the preview of that attached
Ray Chen [Wed, 19 Oct 2011 10:30:48 +0000 (18:30 +0800)]
Fix
5418759 User should be able to view only the preview of that attached
Change-Id: Ie3eb2583f7753fc38db3d59aca544a95112010c7
Wei Huang [Wed, 19 Oct 2011 18:03:41 +0000 (11:03 -0700)]
am
e2c46afe: am
6172a060: Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
* commit '
e2c46afe6fb2ae2424f8440fc1af374b894a91a5':
Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
Wei Huang [Wed, 19 Oct 2011 18:01:43 +0000 (11:01 -0700)]
am
6172a060: Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
* commit '
6172a060689e424ad089594abd5ef1761f6f2ed3':
Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
Wei Huang [Wed, 19 Oct 2011 17:59:15 +0000 (10:59 -0700)]
Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
Chih-Chung Chang [Wed, 19 Oct 2011 17:34:56 +0000 (10:34 -0700)]
am
655a9133: am
d82ac818: Merge "Fix
5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0
* commit '
655a9133b682752a9611bd1d1c6709eda1dedc1f':
Fix
5424444: Add code to save cropped image for non-local, non-picasa cases.
Chih-Chung Chang [Wed, 19 Oct 2011 17:31:31 +0000 (10:31 -0700)]
am
d82ac818: Merge "Fix
5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0
* commit '
d82ac818b88f0755d0515b282445ac1752976140':
Fix
5424444: Add code to save cropped image for non-local, non-picasa cases.
Ray Chen [Wed, 19 Oct 2011 17:21:44 +0000 (10:21 -0700)]
am
0d94b210: resolved conflicts for merge of
71c8cbb7 to master
* commit '
0d94b210dfee1376a11aa53d07a7051a8c181787':
Fix
5213252 [UI] Updated action bar layouts and action orders
Chih-Chung Chang [Wed, 19 Oct 2011 10:38:09 +0000 (03:38 -0700)]
Merge "Fix
5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0
Ray Chen [Wed, 19 Oct 2011 10:36:46 +0000 (18:36 +0800)]
resolved conflicts for merge of
71c8cbb7 to master
Change-Id: Ia5dc7bc54bba46218a53959076777e695ebb9dfe
Chih-Chung Chang [Wed, 19 Oct 2011 10:32:59 +0000 (03:32 -0700)]
am
fbfa7336: am
bd47a5c6: Fix
5352588: Accept view intent without URI.
* commit '
fbfa73361299c5a2284a5aaae8c2b824fd493cd9':
Fix
5352588: Accept view intent without URI.
Ray Chen [Wed, 19 Oct 2011 10:09:26 +0000 (03:09 -0700)]
Merge "Fix
5213252 [UI] Updated action bar layouts and action orders" into ics-mr0
Chih-Chung Chang [Wed, 19 Oct 2011 10:08:49 +0000 (03:08 -0700)]
am
bd47a5c6: Fix
5352588: Accept view intent without URI.
* commit '
bd47a5c6bcdcb127adb13c454fec00d4989c50b6':
Fix
5352588: Accept view intent without URI.
Chih-Chung Chang [Wed, 19 Oct 2011 07:35:28 +0000 (15:35 +0800)]
Fix
5424444: Add code to save cropped image for non-local, non-picasa cases.
Change-Id: Ib9f780f71fc9c50fa68a03ebb49f1bd007ca333d
Ray Chen [Wed, 19 Oct 2011 06:37:02 +0000 (14:37 +0800)]
Fix
5213252 [UI] Updated action bar layouts and action orders
Change-Id: I46e993014e578be2e948ecea775522abc2f38a46
Chih-Chung Chang [Tue, 18 Oct 2011 11:54:31 +0000 (19:54 +0800)]
Fix
5352588: Accept view intent without URI.
Change-Id: I719fd853b66c05c4fdbe70ff97993b9487997694
OSDN Git Service
