OSDN Git Service
Alan Newberger [Tue, 29 Oct 2013 03:55:14 +0000 (20:55 -0700)]
am
6fdb33d2: am
9744244d: am
4edb3438: am
ec036c64: Add white overscroll assets to Gallery2 for v19
* commit '
6fdb33d28eaa8a4ec48bedef593a01e0b75495d9':
Add white overscroll assets to Gallery2 for v19
Alan Newberger [Tue, 29 Oct 2013 03:51:42 +0000 (20:51 -0700)]
am
9744244d: am
4edb3438: am
ec036c64: Add white overscroll assets to Gallery2 for v19
* commit '
9744244d35f031917e96a314a456720c2ade2668':
Add white overscroll assets to Gallery2 for v19
Alan Newberger [Tue, 29 Oct 2013 03:48:17 +0000 (20:48 -0700)]
am
4edb3438: am
ec036c64: Add white overscroll assets to Gallery2 for v19
* commit '
4edb3438a7f1120c7a6754a07029f80d6b6622bc':
Add white overscroll assets to Gallery2 for v19
Baligh Uddin [Fri, 25 Oct 2013 19:02:09 +0000 (12:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf4373c99de9082a4ba95585efb07d70e5be07a6
Auto-generated-cl: translation import
Alan Newberger [Fri, 25 Oct 2013 17:55:19 +0000 (10:55 -0700)]
am
ec036c64: Add white overscroll assets to Gallery2 for v19
* commit '
ec036c64173ac581f460b25330248fda2a6cb57a':
Add white overscroll assets to Gallery2 for v19
Alan Newberger [Fri, 25 Oct 2013 17:49:05 +0000 (10:49 -0700)]
Add white overscroll assets to Gallery2 for v19
This CL makes Gallery show white overscroll in filmstrip view,
when on v19 API devices.
Bug:
11321533
Change-Id: Ic2b2bd3567d0f08be6b2a70f7af218ac0f58c2a5
Baligh Uddin [Thu, 24 Oct 2013 03:18:17 +0000 (20:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I02fea7dd8166ee0c0dd8ebc074400fae45120d79
Auto-generated-cl: translation import
Narayan Kamath [Wed, 23 Oct 2013 16:43:23 +0000 (16:43 +0000)]
Merge "Fix invalid private access."
Narayan Kamath [Wed, 23 Oct 2013 13:39:27 +0000 (14:39 +0100)]
Fix invalid private access.
See http://bugs.sun.com/view_bug.do?bug_id=
6904536
bug:
8992787
Change-Id: I377678a32dff9b7cf8e19c8840f1382b4a4f006e
Mangesh Ghiware [Tue, 22 Oct 2013 23:40:29 +0000 (16:40 -0700)]
am
e7fb7e3e: am
ff88d699: am
2229a8f7: am
b6892ab9: Consider camera available only if intent resolves to an activity.
* commit '
e7fb7e3e184835e82cb3023c6d0ec2fca3e1d3c6':
Consider camera available only if intent resolves to an activity.
Mangesh Ghiware [Tue, 22 Oct 2013 23:38:09 +0000 (16:38 -0700)]
am
ff88d699: am
2229a8f7: am
b6892ab9: Consider camera available only if intent resolves to an activity.
* commit '
ff88d699474951e753d3e5ed65eb8fe1db0c227e':
Consider camera available only if intent resolves to an activity.
Mangesh Ghiware [Tue, 22 Oct 2013 23:35:57 +0000 (16:35 -0700)]
am
2229a8f7: am
b6892ab9: Consider camera available only if intent resolves to an activity.
* commit '
2229a8f79642611942a8b6e82038f4ec4eb55d4f':
Consider camera available only if intent resolves to an activity.
Mangesh Ghiware [Tue, 22 Oct 2013 23:33:48 +0000 (16:33 -0700)]
am
b6892ab9: Consider camera available only if intent resolves to an activity.
* commit '
b6892ab9e603661f73d97b50adcecc5103ebcd6f':
Consider camera available only if intent resolves to an activity.
Mangesh Ghiware [Tue, 22 Oct 2013 21:10:17 +0000 (14:10 -0700)]
Consider camera available only if intent resolves to an activity.
Fixes crash for restricted profiles without a camera.
Bug:
11289596
Change-Id: I3545dbeae2e4c9094746b51b770daa93e3896bb6
Baligh Uddin [Tue, 22 Oct 2013 19:55:25 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE"
John Hoford [Tue, 22 Oct 2013 19:00:41 +0000 (12:00 -0700)]
am
341bbcfe: am
4dab01b4: am
c96c059e: am
85f460b8: fix crop not supporting non-normal orientation
* commit '
341bbcfee074a695260eea3ab4caa1185b6b5d20':
fix crop not supporting non-normal orientation
John Hoford [Tue, 22 Oct 2013 18:59:02 +0000 (11:59 -0700)]
am
4dab01b4: am
c96c059e: am
85f460b8: fix crop not supporting non-normal orientation
* commit '
4dab01b4b655766e5ddf0ee2a7768bddd107a843':
fix crop not supporting non-normal orientation
John Hoford [Tue, 22 Oct 2013 18:53:54 +0000 (11:53 -0700)]
am
c96c059e: am
85f460b8: fix crop not supporting non-normal orientation
* commit '
c96c059e1a07460162fa86ed33b5248012f10697':
fix crop not supporting non-normal orientation
John Hoford [Tue, 22 Oct 2013 18:50:46 +0000 (11:50 -0700)]
am
85f460b8: fix crop not supporting non-normal orientation
* commit '
85f460b8ba236167bccf560358aefd560f7b58f0':
fix crop not supporting non-normal orientation
John Hoford [Tue, 22 Oct 2013 18:36:19 +0000 (11:36 -0700)]
fix crop not supporting non-normal orientation
bug:
11324471
Change-Id: Ib4a76ac1540700eeaa4ddd727b06f9a29b999827
nicolasroard [Mon, 21 Oct 2013 23:38:26 +0000 (16:38 -0700)]
am
2de9d671: am
f9cac774: am
7ba0f3c9: am
5a1d760b: Fix crash when exporting with null fx
* commit '
2de9d671bfdcee70e2f9db99d86dec6b05a38d4e':
Fix crash when exporting with null fx
nicolasroard [Mon, 21 Oct 2013 23:36:26 +0000 (16:36 -0700)]
am
f9cac774: am
7ba0f3c9: am
5a1d760b: Fix crash when exporting with null fx
* commit '
f9cac7749d483e59f75d8307f410bc4c102f9670':
Fix crash when exporting with null fx
nicolasroard [Mon, 21 Oct 2013 23:33:47 +0000 (16:33 -0700)]
am
7ba0f3c9: am
5a1d760b: Fix crash when exporting with null fx
* commit '
7ba0f3c9e79ef7c9fa16a9626b82aaa25347a4e1':
Fix crash when exporting with null fx
nicolasroard [Mon, 21 Oct 2013 23:31:47 +0000 (16:31 -0700)]
am
5a1d760b: Fix crash when exporting with null fx
* commit '
5a1d760b60040a8a47d876a9accd27f0bc7be455':
Fix crash when exporting with null fx
nicolasroard [Mon, 21 Oct 2013 21:37:27 +0000 (14:37 -0700)]
am
cea6b30c: am
62349321: am
656cbe6e: am
97ad2bdc: Handles export size zero
* commit '
cea6b30c0eeeec004584f82e81b073dc683c0373':
Handles export size zero
nicolasroard [Mon, 21 Oct 2013 21:33:20 +0000 (14:33 -0700)]
am
62349321: am
656cbe6e: am
97ad2bdc: Handles export size zero
* commit '
62349321d46007285d6a30d644a57b949068e579':
Handles export size zero
nicolasroard [Mon, 21 Oct 2013 21:30:43 +0000 (14:30 -0700)]
am
656cbe6e: am
97ad2bdc: Handles export size zero
* commit '
656cbe6ea60579dc83b1f336e23bd6b49cd25f80':
Handles export size zero
nicolasroard [Mon, 21 Oct 2013 21:28:44 +0000 (14:28 -0700)]
am
97ad2bdc: Handles export size zero
* commit '
97ad2bdcb39c0484dafb08f4a7f45bcd1a3f4f9d':
Handles export size zero
nicolasroard [Mon, 21 Oct 2013 20:52:10 +0000 (13:52 -0700)]
Fix crash when exporting with null fx
bug:
11281209
Change-Id: I71837bcb18b75201542309f71f99ba7abfb65f93
nicolasroard [Mon, 21 Oct 2013 18:45:54 +0000 (11:45 -0700)]
Handles export size zero
bug:
11280447
Change-Id: Ia8758a6d269b4ac9fdc9435b3bcdf9295c3e11a9
Baligh Uddin [Mon, 21 Oct 2013 18:30:47 +0000 (11:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I73990fb80e4d997b3877cb3163782fc6422c669c
Auto-generated-cl: translation import
nicolasroard [Fri, 18 Oct 2013 00:36:40 +0000 (17:36 -0700)]
am
8f8baa62: am
bbc64781: am
cdd7d873: am
4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad
* commit '
8f8baa6291dda2e388e0d02f5a628e7fce3410ec':
Fix wrong applied fx
nicolasroard [Fri, 18 Oct 2013 00:33:34 +0000 (17:33 -0700)]
am
bbc64781: am
cdd7d873: am
4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad
* commit '
bbc64781544100b56ea5ac5ffb46e93ffe8688ea':
Fix wrong applied fx
nicolasroard [Fri, 18 Oct 2013 00:31:04 +0000 (17:31 -0700)]
am
cdd7d873: am
4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad
* commit '
cdd7d873d5cd398428bf5ed280feda61b8cd1f38':
Fix wrong applied fx
nicolasroard [Fri, 18 Oct 2013 00:29:06 +0000 (17:29 -0700)]
am
4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad
* commit '
4bbcb6da1e94ebd811e97deb1df2133fc0e39ef2':
Fix wrong applied fx
nicolasroard [Fri, 18 Oct 2013 00:27:29 +0000 (00:27 +0000)]
Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 17:25:36 +0000 (10:25 -0700)]
am
2521ab4d: (-s ours) am
c979a13a: (-s ours) am
77a62e2e: (-s ours) am
009a34fc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
2521ab4d76bfef1b63e9bd5158efb519f65a5d4c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:25:35 +0000 (10:25 -0700)]
am
67830281: (-s ours) am
7f8dd303: (-s ours) am
75c57fda: (-s ours) am
565eece8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
678302815696595852c786629c1305069c9871fb':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:23:55 +0000 (10:23 -0700)]
am
c979a13a: (-s ours) am
77a62e2e: (-s ours) am
009a34fc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
c979a13a8805a4dd962a8d09d4d91c8e219b0971':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:23:55 +0000 (10:23 -0700)]
am
7f8dd303: (-s ours) am
75c57fda: (-s ours) am
565eece8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
7f8dd303e49c1c99e3e3d085f1b1bbd10a1bc9b1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:21:51 +0000 (10:21 -0700)]
am
77a62e2e: (-s ours) am
009a34fc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
77a62e2ed268abfea2f45f0aba89ad05cac282fe':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:21:51 +0000 (10:21 -0700)]
am
75c57fda: (-s ours) am
565eece8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
75c57fda5d9f5631e112460591bd6b3e6502a276':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:19:06 +0000 (10:19 -0700)]
am
009a34fc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
009a34fce5707cbea5d3500ecb4c479b8945b76b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:19:05 +0000 (10:19 -0700)]
am
565eece8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
565eece8603aa5e0ff565cb2ac894b07f17cb904':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 17:17:20 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 17:17:11 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 07:39:30 +0000 (00:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10541e5c871126a329be839dd80b4c757394866b
Auto-generated-cl: translation import
Baligh Uddin [Thu, 17 Oct 2013 07:30:49 +0000 (00:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I530ffacc276c7151e76055b6fdeb241c2b7c0be3
Auto-generated-cl: translation import
Ed Heyl [Thu, 17 Oct 2013 01:07:40 +0000 (18:07 -0700)]
am
289306f1: am
b8f36242: am
a88cf82c: merge in klp-release (no-op)
* commit '
289306f103b181378d5d58850cf61495facc3204':
Rename Gallery activity and add trampoline
enable change in printing
Ed Heyl [Thu, 17 Oct 2013 01:02:06 +0000 (18:02 -0700)]
am
b8f36242: am
a88cf82c: merge in klp-release (no-op)
* commit '
b8f36242a11f6323e957bcd1b7c6b849c9573b59':
Rename Gallery activity and add trampoline
enable change in printing
Ed Heyl [Thu, 17 Oct 2013 00:52:17 +0000 (17:52 -0700)]
am
a88cf82c: merge in klp-release (no-op)
* commit '
a88cf82c6eb7f5767efbf7f254ce75f100f5f86a':
Rename Gallery activity and add trampoline
enable change in printing
Ed Heyl [Thu, 17 Oct 2013 00:45:36 +0000 (17:45 -0700)]
merge in klp-release (no-op)
nicolasroard [Thu, 17 Oct 2013 00:39:05 +0000 (17:39 -0700)]
Fix wrong applied fx
Typo in serialization name causes the wrong effect to be applied
bug:
11260854
Change-Id: I2d939f49edb7cc61f564bb1e2e6cfa6aad37164c
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:21:45 +0000 (15:21 -0700)]
am
4e20a92d: am
556a015d: am
19b2236c: am
c0247a59: updated camera launcher icon in Gallery2 package as well
* commit '
4e20a92db1f6511003a5c14b3e5bfb77029e798b':
updated camera launcher icon in Gallery2 package as well
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:18:48 +0000 (15:18 -0700)]
am
556a015d: am
19b2236c: am
c0247a59: updated camera launcher icon in Gallery2 package as well
* commit '
556a015d3e7ed9e821795ca13a5daf7ba34aafd5':
updated camera launcher icon in Gallery2 package as well
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:16:20 +0000 (15:16 -0700)]
am
19b2236c: am
c0247a59: updated camera launcher icon in Gallery2 package as well
* commit '
19b2236c1707e79fdb3b6d911b1142c6074c5950':
updated camera launcher icon in Gallery2 package as well
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:13:54 +0000 (15:13 -0700)]
am
c0247a59: updated camera launcher icon in Gallery2 package as well
* commit '
c0247a599ffa70eebda4f1c8c1ce5b132da648bd':
updated camera launcher icon in Gallery2 package as well
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 17:36:18 +0000 (10:36 -0700)]
updated camera launcher icon in Gallery2 package as well
fixes b/
11252316
Change-Id: I164492e9fd6544257d685279c35ba026f24ca79d
The Android Automerger [Wed, 16 Oct 2013 08:31:59 +0000 (01:31 -0700)]
merge in klp-release history after reset to klp-dev
Alan Newberger [Wed, 16 Oct 2013 05:39:36 +0000 (22:39 -0700)]
am
bcd82476: am
4460df7c: am
efa8ae01: am
1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
* commit '
bcd824760f04a5c44651275c52c261a8f0378b0d':
Update Gallery2 camera launchers
nicolasroard [Wed, 16 Oct 2013 05:39:35 +0000 (22:39 -0700)]
am
0a14237c: am
c41bf6c0: am
48265373: am
1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
* commit '
0a14237cbaf3ab75c63934cfb1aa6f2d0c0f5f65':
Fix Gallery auto-hide action bar in Album view
nicolasroard [Wed, 16 Oct 2013 05:39:35 +0000 (22:39 -0700)]
am
2f7dd4d3: am
62cd0cfc: am
50427582: am
2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
* commit '
2f7dd4d323d6ef811b96d32f8fade1c97c56f978':
Fix crash "Gallery has stopped" popup occurs during print setup
Alan Newberger [Wed, 16 Oct 2013 05:37:01 +0000 (22:37 -0700)]
am
4460df7c: am
efa8ae01: am
1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
* commit '
4460df7c2bd4007ae658cd1a4a367c0bddca5c1f':
Update Gallery2 camera launchers
nicolasroard [Wed, 16 Oct 2013 05:37:00 +0000 (22:37 -0700)]
am
c41bf6c0: am
48265373: am
1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
* commit '
c41bf6c0fe7ce0dd2d085898c6de3fbebd543825':
Fix Gallery auto-hide action bar in Album view
nicolasroard [Wed, 16 Oct 2013 05:37:00 +0000 (22:37 -0700)]
am
62cd0cfc: am
50427582: am
2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
* commit '
62cd0cfc336fd6a5bda46f544b556f493c3abae5':
Fix crash "Gallery has stopped" popup occurs during print setup
Alan Newberger [Wed, 16 Oct 2013 05:35:38 +0000 (22:35 -0700)]
am
efa8ae01: am
1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
* commit '
efa8ae01ad897457f86c17477ea3d5a3330ba521':
Update Gallery2 camera launchers
nicolasroard [Wed, 16 Oct 2013 05:35:38 +0000 (22:35 -0700)]
am
48265373: am
1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
* commit '
48265373efbc89e3e4fd07b913b118ca645a4d02':
Fix Gallery auto-hide action bar in Album view
nicolasroard [Wed, 16 Oct 2013 05:35:37 +0000 (22:35 -0700)]
am
50427582: am
2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
* commit '
50427582dcb4ab4be04d7bfdaa236a78de99aa95':
Fix crash "Gallery has stopped" popup occurs during print setup
Alan Newberger [Wed, 16 Oct 2013 05:34:22 +0000 (22:34 -0700)]
am
1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
* commit '
1582e5dfdbc19ea704ab0f9c77df8cd94eea3056':
Update Gallery2 camera launchers
nicolasroard [Wed, 16 Oct 2013 05:34:21 +0000 (22:34 -0700)]
am
1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
* commit '
1b56a245a253244628ff0ddfdbe5f51cf8475b16':
Fix Gallery auto-hide action bar in Album view
nicolasroard [Wed, 16 Oct 2013 05:34:21 +0000 (22:34 -0700)]
am
2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
* commit '
2037f39bd3b5caeb8161928df59acff5cd92dd38':
Fix crash "Gallery has stopped" popup occurs during print setup
Alan Newberger [Wed, 16 Oct 2013 05:31:58 +0000 (05:31 +0000)]
Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad
nicolasroard [Wed, 16 Oct 2013 05:31:28 +0000 (05:31 +0000)]
Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad
nicolasroard [Wed, 16 Oct 2013 05:31:15 +0000 (05:31 +0000)]
Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad
The Android Automerger [Wed, 16 Oct 2013 04:14:16 +0000 (21:14 -0700)]
merge in klp-release history after reset to klp-dev
Alan Newberger [Wed, 16 Oct 2013 03:54:29 +0000 (20:54 -0700)]
Update Gallery2 camera launchers
This updates the Camera launcher icons used in the trampoline activity
which preserves existing shortcuts from Camera icons on JB MR2 home screens.
Bug:
11242234
Change-Id: I1fa83f4353112130b2f35d8d6a6884f090e3da82
nicolasroard [Wed, 16 Oct 2013 02:46:05 +0000 (19:46 -0700)]
Fix crash "Gallery has stopped" popup occurs during print setup
bug:
11159662
Change-Id: I181fe6f581290067b9a39d1382bf6ede08484c0a
Mangesh Ghiware [Wed, 16 Oct 2013 02:37:14 +0000 (19:37 -0700)]
am
9f13ea34: am
30655083: am
11bf46c0: am
a4f2389c: Catch all the exceptions.
* commit '
9f13ea34348c031a98c5a00fd083e32252933f5a':
Catch all the exceptions.
Mangesh Ghiware [Wed, 16 Oct 2013 02:34:13 +0000 (19:34 -0700)]
am
30655083: am
11bf46c0: am
a4f2389c: Catch all the exceptions.
* commit '
30655083dcf6843f69bf4a1ed453625ca9487248':
Catch all the exceptions.
Mangesh Ghiware [Wed, 16 Oct 2013 02:31:53 +0000 (19:31 -0700)]
am
11bf46c0: am
a4f2389c: Catch all the exceptions.
* commit '
11bf46c0cb7963ce103ce8d3f67eb743600e00e8':
Catch all the exceptions.
Mangesh Ghiware [Wed, 16 Oct 2013 02:28:41 +0000 (19:28 -0700)]
am
a4f2389c: Catch all the exceptions.
* commit '
a4f2389cf50404854d7820326d776deb7b6c1ad7':
Catch all the exceptions.
Mangesh Ghiware [Wed, 16 Oct 2013 00:53:42 +0000 (17:53 -0700)]
Catch all the exceptions.
Bug:
11156898
Change-Id: Ic16a858bb5d1f8838ffa201c910b617f859c9074
nicolasroard [Tue, 15 Oct 2013 22:36:16 +0000 (15:36 -0700)]
Fix Gallery auto-hide action bar in Album view
bug:
11218758
Change-Id: Id48e54842ea3539396801d99ea8ec33e58c7a1f1
The Android Automerger [Tue, 15 Oct 2013 13:01:11 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Tenghui Zhu [Tue, 15 Oct 2013 11:01:20 +0000 (04:01 -0700)]
am
8debeb36: am
1214470a: am
94678fc1: am
db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
* commit '
8debeb3653646fc88a723fc7dfa28d6c73d8ba7c':
Revert "Play the video on top of lock screen"
John Hoford [Tue, 15 Oct 2013 11:01:19 +0000 (04:01 -0700)]
am
9026a43d: am
74ea45fa: am
8cee8116: am
5169137f: fix Vignette collapse to a line
* commit '
9026a43d1ef12e83900ff5ce789877ec524ddbb8':
fix Vignette collapse to a line
Tenghui Zhu [Tue, 15 Oct 2013 02:01:14 +0000 (19:01 -0700)]
am
1214470a: am
94678fc1: am
db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
* commit '
1214470a617e31d65f8efe507143945a428be5b8':
Revert "Play the video on top of lock screen"
John Hoford [Tue, 15 Oct 2013 02:01:14 +0000 (19:01 -0700)]
am
74ea45fa: am
8cee8116: am
5169137f: fix Vignette collapse to a line
* commit '
74ea45fa511977cc579ef4b78ceb413a6312793a':
fix Vignette collapse to a line
Tenghui Zhu [Tue, 15 Oct 2013 00:19:57 +0000 (17:19 -0700)]
am
94678fc1: am
db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
* commit '
94678fc1d2b5235cfeae360ca2567579e8fed848':
Revert "Play the video on top of lock screen"
John Hoford [Tue, 15 Oct 2013 00:19:23 +0000 (17:19 -0700)]
am
8cee8116: am
5169137f: fix Vignette collapse to a line
* commit '
8cee8116468f4cb6c486994c4bf83b4a0dffaddc':
fix Vignette collapse to a line
Tenghui Zhu [Mon, 14 Oct 2013 23:48:30 +0000 (16:48 -0700)]
am
db30124a: Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
* commit '
db30124ab6dabd8e24789efaa4e6db7622889b87':
Revert "Play the video on top of lock screen"
Tenghui Zhu [Mon, 14 Oct 2013 23:44:18 +0000 (23:44 +0000)]
Merge "Revert "Play the video on top of lock screen"" into gb-ub-photos-carlsbad
John Hoford [Mon, 14 Oct 2013 22:23:46 +0000 (15:23 -0700)]
am
5169137f: fix Vignette collapse to a line
* commit '
5169137f59114a9549dd056ce4bf843b9b421c4a':
fix Vignette collapse to a line
John Hoford [Mon, 14 Oct 2013 22:09:45 +0000 (15:09 -0700)]
fix Vignette collapse to a line
bug:
11221755
Change-Id: Ibe04770d0cfd3fe596ef72e86ccfe461c0cf63b1
Mangesh Ghiware [Mon, 14 Oct 2013 17:53:03 +0000 (10:53 -0700)]
am
04299f79: am
0bb52872: am
41f9cf0a: am
315ce716: One crop and set wallpaper activity is enough!
* commit '
04299f7971fb8b420ef7ede7dc2e770e7faf250b':
One crop and set wallpaper activity is enough!
nicolasroard [Mon, 14 Oct 2013 17:49:48 +0000 (10:49 -0700)]
am
0358df76: am
1c2bfe47: am
0fff5600: am
976b9a3a: Fix showing the wrong image after animation
* commit '
0358df764fbfab779ae5c9524cc91ce39104b8fd':
Fix showing the wrong image after animation
nicolasroard [Mon, 14 Oct 2013 17:49:37 +0000 (10:49 -0700)]
am
8137a629: am
3bf57172: am
5063d3ab: am
eeed64b1: Process correctly an export when called with EDIT intent
* commit '
8137a629653e24775740adfc1ada9baa08f5446f':
Process correctly an export when called with EDIT intent
John Hoford [Mon, 14 Oct 2013 17:48:54 +0000 (10:48 -0700)]
am
356ea35e: am
4283930e: am
72dfc381: am
dfe30aa6: Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad
* commit '
356ea35eb27706674a1bd185d39fe48c089f3104':
fix showing wrong image post save
John Hoford [Mon, 14 Oct 2013 17:48:53 +0000 (10:48 -0700)]
am
4df968a0: am
de12d6a6: am
e64845e0: am
4c107f27: fixed crash when applying the none filter
* commit '
4df968a09cdf4863b7e6a146d078690ceeec7e35':
fixed crash when applying the none filter
Tenghui Zhu [Mon, 14 Oct 2013 16:16:18 +0000 (16:16 +0000)]
Revert "Play the video on top of lock screen"
This reverts commit
417f074dbcf07843bf02e762c2fe3b23fe8af32b.
From the discussion in the bug, for Carlsbad, we will take
the JBMR2 approach for safety concern.
Change-Id: Ieae45e1ae7580c94c08277e580b123e6f504a3b4
bug:
11190995
OSDN Git Service
