OSDN Git Service
Baligh Uddin [Thu, 20 Feb 2014 21:09:28 +0000 (21:09 +0000)]
am
09fbf351: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
09fbf3517a9be35e180f056ed0ffbc280e7c5087':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:09:27 +0000 (21:09 +0000)]
am
53851696: (-s ours) Import translations. DO NOT MERGE
* commit '
538516960287f12bc75cec07d37ea1e79083f039':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 21:06:57 +0000 (21:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 20 Feb 2014 17:03:00 +0000 (09:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I46b2b3a5dd09ad1988250cff0b5c2724f29a4872
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Feb 2014 16:47:09 +0000 (08:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2b7221c550002cdb0fd9718d95bbd3fe5530f191
Auto-generated-cl: translation import
Baligh Uddin [Tue, 7 Jan 2014 05:11:22 +0000 (21:11 -0800)]
am
e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e1f9ccbea957dc5f14a69de544a9f640ac829db5':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:11:22 +0000 (21:11 -0800)]
am
e0659df8: (-s ours) Import translations. DO NOT MERGE
* commit '
e0659df8ee4f0b098ae196523c46e45ccd8fd5ea':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:08:46 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 7 Jan 2014 03:23:12 +0000 (19:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6bb582ef72de10b1e9e54548f219d8a900bdd2ca
Auto-generated-cl: translation import
Baligh Uddin [Tue, 7 Jan 2014 03:17:47 +0000 (19:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2bd761c654ca6b43089cd94fd7aee1bbe8c8c3de
Auto-generated-cl: translation import
Baligh Uddin [Thu, 19 Dec 2013 15:28:05 +0000 (07:28 -0800)]
am
76310806: (-s ours) Import translations. DO NOT MERGE
* commit '
76310806f0081c7991404de9c8a80e977cd0b1aa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 06:44:35 +0000 (22:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I74fbdf2c0ea3817c249509449ccdf8d45aaa4f13
Auto-generated-cl: translation import
Baligh Uddin [Thu, 12 Dec 2013 16:40:40 +0000 (08:40 -0800)]
am
299926e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
299926e60f4ac8ef3a228ca38ce45d290b69659b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 16:40:39 +0000 (08:40 -0800)]
am
b24fcaae: (-s ours) Import translations. DO NOT MERGE
* commit '
b24fcaae272f9219f96931feabe9887b91dbebab':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 15:48:25 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 12 Dec 2013 04:50:48 +0000 (20:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7baeb6a135280e6e3d924dbbb88b0bdeab70a158
Auto-generated-cl: translation import
Baligh Uddin [Thu, 12 Dec 2013 04:42:59 +0000 (20:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7bac9f63cb528615849b859fd1fef56f8a6977c0
Auto-generated-cl: translation import
Baligh Uddin [Fri, 22 Nov 2013 01:30:10 +0000 (17:30 -0800)]
am
ded9ab3b: (-s ours) am
76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
ded9ab3b0dcf24cf0b269284b43eec7c53907e72':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:30:09 +0000 (17:30 -0800)]
am
2a6118a6: (-s ours) am
daac361f: (-s ours) Import translations. DO NOT MERGE
* commit '
2a6118a672846cafb816aeffa0a6ca6a4b291d81':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:23:50 +0000 (17:23 -0800)]
am
76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
* commit '
76ad19f1c70df359d03ec0d2142805c263d39a01':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:23:49 +0000 (17:23 -0800)]
am
daac361f: (-s ours) Import translations. DO NOT MERGE
* commit '
daac361f913e0f148c63696020df5a6feb9461f6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 01:20:43 +0000 (01:20 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Fri, 22 Nov 2013 00:44:11 +0000 (16:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I821f344b4a1b993dd1626c2f98d049a9f104493c
Auto-generated-cl: translation import
Baligh Uddin [Fri, 22 Nov 2013 00:42:19 +0000 (16:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I49f6e3ff0256e4c1649461f919beb7549e3bbe12
Auto-generated-cl: translation import
ztenghui [Tue, 19 Nov 2013 00:40:41 +0000 (16:40 -0800)]
am
947478b6: am
aa22947b: Fix the thumbnail generation.
* commit '
947478b68e6aaf6ea5803c3c8fc06d58b6ba05f7':
Fix the thumbnail generation.
ztenghui [Tue, 19 Nov 2013 00:38:25 +0000 (16:38 -0800)]
am
aa22947b: Fix the thumbnail generation.
* commit '
aa22947b6f0714b73a78a28fb1217f7c5f4f663d':
Fix the thumbnail generation.
ztenghui [Tue, 19 Nov 2013 00:13:55 +0000 (16:13 -0800)]
Fix the thumbnail generation.
bug:
11664501
Change-Id: I53ec5a08e801d0300b8ed159158bc46f61c6d3f4
Baligh Uddin [Thu, 14 Nov 2013 04:54:58 +0000 (20:54 -0800)]
am
3715fb1f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3715fb1f98ac84d0cb3f3211cfc5d3e6b051f6a4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 04:54:57 +0000 (20:54 -0800)]
am
78db2b06: (-s ours) Import translations. DO NOT MERGE
* commit '
78db2b0639370f13f8d5c2590bf2b82ad843b338':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Nov 2013 04:53:41 +0000 (04:53 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 14 Nov 2013 03:01:52 +0000 (19:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I581b5ac77039dd63620821b29bab86a72ca53174
Auto-generated-cl: translation import
Baligh Uddin [Thu, 14 Nov 2013 02:56:04 +0000 (18:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7fdd7cc0fea389d1be31016de687d65127289968
Auto-generated-cl: translation import
Baligh Uddin [Tue, 5 Nov 2013 23:19:16 +0000 (15:19 -0800)]
am
8689b2f5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
8689b2f5354146136a9d8634eb5d92834e2f5107':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:19:15 +0000 (15:19 -0800)]
am
a4d7d822: (-s ours) Import translations. DO NOT MERGE
* commit '
a4d7d822882fb5b00c812dd2aca4d830da79f9bc':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Nov 2013 23:16:40 +0000 (23:16 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 5 Nov 2013 00:18:33 +0000 (16:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I27befbed9a043915f8cb6f4b75f440a65e773194
Auto-generated-cl: translation import
Baligh Uddin [Tue, 5 Nov 2013 00:13:14 +0000 (16:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5ab42a1fb27f93d5619ad1aa9ded29fd853ee4d6
Auto-generated-cl: translation import
nicolasroard [Sat, 2 Nov 2013 18:08:50 +0000 (11:08 -0700)]
am
00dfa8a1: am
1619b3c3: Fix infinite spinner dialog
* commit '
00dfa8a133995d229c8bfc17ca8b229c55d15188':
Fix infinite spinner dialog
nicolasroard [Sat, 2 Nov 2013 18:04:30 +0000 (11:04 -0700)]
am
1619b3c3: Fix infinite spinner dialog
* commit '
1619b3c3ed20fad548d31464ab5a2252b2c3b65f':
Fix infinite spinner dialog
nicolasroard [Sat, 2 Nov 2013 03:50:30 +0000 (20:50 -0700)]
Fix infinite spinner dialog
bug:
11328106
Change-Id: Icbfcb7bb6c88a03c81315789b2569da440267edd
nicolasroard [Sat, 2 Nov 2013 01:43:02 +0000 (18:43 -0700)]
am
07986225: am
c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad
* commit '
07986225643c5bccb472821ef68f7c285bd9fa58':
Disable geometry button if tiny planet is here
nicolasroard [Sat, 2 Nov 2013 01:40:43 +0000 (18:40 -0700)]
am
c82e65b4: Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad
* commit '
c82e65b4f05ae7ad1e910e84ebf8ba65e6afb3bd':
Disable geometry button if tiny planet is here
nicolasroard [Sat, 2 Nov 2013 01:37:30 +0000 (01:37 +0000)]
Merge "Disable geometry button if tiny planet is here" into gb-ub-photos-carlsbad
John Hoford [Sat, 2 Nov 2013 00:32:32 +0000 (17:32 -0700)]
am
d6644d60: am
c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
* commit '
d6644d6047b4257c5d01848a45428651f0ae5401':
fix Gallery crash using crop
John Hoford [Sat, 2 Nov 2013 00:28:10 +0000 (17:28 -0700)]
am
c0c6f058: Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
* commit '
c0c6f058d464be3e4d6925239bcabc5b56fbce80':
fix Gallery crash using crop
John Hoford [Sat, 2 Nov 2013 00:08:20 +0000 (00:08 +0000)]
Merge "fix Gallery crash using crop" into gb-ub-photos-carlsbad
nicolasroard [Fri, 1 Nov 2013 23:03:35 +0000 (16:03 -0700)]
Disable geometry button if tiny planet is here
bug:
11288853
Change-Id: I818f406eb25e0f82c89ffde0bd91d2aa8ab31b94
John Hoford [Thu, 31 Oct 2013 23:17:01 +0000 (16:17 -0700)]
fix Gallery crash using crop
bug:
11347083
Change-Id: Ic5417d12e0b1cee181ddad8d581eddc6aeb8a5b8
Alan Newberger [Thu, 31 Oct 2013 22:41:08 +0000 (15:41 -0700)]
am
164de4d8: am
21b61954: Gallery should show up in recents even when run via shortcut
* commit '
164de4d861636730b59ac3e7d64fdd2af36ac089':
Gallery should show up in recents even when run via shortcut
Alan Newberger [Thu, 31 Oct 2013 22:39:03 +0000 (15:39 -0700)]
am
21b61954: Gallery should show up in recents even when run via shortcut
* commit '
21b619541d6a92d595bbe6e95d4a0b46b6f40f77':
Gallery should show up in recents even when run via shortcut
Alan Newberger [Thu, 31 Oct 2013 22:15:45 +0000 (15:15 -0700)]
Gallery should show up in recents even when run via shortcut
Gallery when run through the shortcut doesn't show up in recents. This
is a minimal change to show the activity in recents even when started
via shortcut.
Bug:
11195140
Change-Id: Iaa7230fd1874871744403b1b2e2e9216c4cb73d2
Alan Newberger [Wed, 30 Oct 2013 18:53:31 +0000 (11:53 -0700)]
am
48372e31: am
ebbcc394: Avoid crash if user disables Camera while Gallery is open
* commit '
48372e319a4e27b08c4449391b8bc92a4a59ebbe':
Avoid crash if user disables Camera while Gallery is open
Alan Newberger [Wed, 30 Oct 2013 18:50:36 +0000 (11:50 -0700)]
am
ebbcc394: Avoid crash if user disables Camera while Gallery is open
* commit '
ebbcc3944adcc01846128d1bdacc7c8b1c8cdb35':
Avoid crash if user disables Camera while Gallery is open
Alan Newberger [Wed, 30 Oct 2013 18:42:14 +0000 (11:42 -0700)]
Avoid crash if user disables Camera while Gallery is open
We cache the camera availability check so in the corner case that
a user disables their camera in package manager, avoid crashing.
Not necessary to do more sophisticated handling since this is a
narrow case initiated by user.
Bug:
11435559
Change-Id: I54d5015cdd9b64aec5c9da9a393824d3b41201a1
Baligh Uddin [Tue, 29 Oct 2013 03:48:17 +0000 (20:48 -0700)]
am
dcd1b260: (-s ours) Import translations. DO NOT MERGE
* commit '
dcd1b26068aeb71624220bdff25703dfbf5b7058':
Import translations. DO NOT MERGE
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 [Mon, 28 Oct 2013 23:11:52 +0000 (16:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c060e534ca7ee4ff30b2827a3162d2267e4b7d4
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
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
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: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: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
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: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 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: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: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
OSDN Git Service
