OSDN Git Service
George Mount [Tue, 12 Mar 2013 21:01:42 +0000 (21:01 +0000)]
am
657ddfa9: am
d2730296: am
b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
* commit '
657ddfa95f712c1f2da5d9d4fb5af90aa497edce':
Add delete cascade for Accounts.
George Mount [Tue, 12 Mar 2013 20:59:02 +0000 (20:59 +0000)]
am
d2730296: am
b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
* commit '
d2730296cd0f1c62796c606204d38622a8273228':
Add delete cascade for Accounts.
George Mount [Tue, 12 Mar 2013 20:56:29 +0000 (13:56 -0700)]
am
b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
* commit '
b3831f7714715f2e1693b89d5bc4854381918bbc':
Add delete cascade for Accounts.
George Mount [Tue, 12 Mar 2013 20:53:21 +0000 (20:53 +0000)]
Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
George Mount [Tue, 12 Mar 2013 20:13:21 +0000 (13:13 -0700)]
Add delete cascade for Accounts.
Change-Id: I962c7cb657643c3eddbbeb6a691b26de5553d4df
John Reck [Tue, 12 Mar 2013 20:14:10 +0000 (20:14 +0000)]
am
ff6ae394: am
5ec22bd8: am
1124090a: Fix ICS compatibility issues
* commit '
ff6ae394828a5d043ee7fc15965ce0d6a16096d8':
Fix ICS compatibility issues
John Reck [Tue, 12 Mar 2013 20:12:37 +0000 (20:12 +0000)]
am
5ec22bd8: am
1124090a: Fix ICS compatibility issues
* commit '
5ec22bd839dd7c0ba7fde6ab3c4e39205dd659d6':
Fix ICS compatibility issues
John Reck [Tue, 12 Mar 2013 20:11:02 +0000 (13:11 -0700)]
am
1124090a: Fix ICS compatibility issues
* commit '
1124090a300e96f6d1d5b0c67f3fe314daf32743':
Fix ICS compatibility issues
John Reck [Tue, 12 Mar 2013 19:55:27 +0000 (12:55 -0700)]
Fix ICS compatibility issues
Change-Id: I43f3236b9da0424fde66d3ad4d46403223fde8bf
Justin Koh [Tue, 12 Mar 2013 19:13:58 +0000 (19:13 +0000)]
am
a043b351: am
8384597d: am
f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce
* commit '
a043b351bdbe46ba21a520b5d4dc05c202bff6dd':
Update Pano XML tag and permission.
Justin Koh [Tue, 12 Mar 2013 19:12:31 +0000 (19:12 +0000)]
am
8384597d: am
f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce
* commit '
8384597dc2253d49da0e716a9e85f7fa778f403e':
Update Pano XML tag and permission.
Justin Koh [Tue, 12 Mar 2013 19:11:32 +0000 (12:11 -0700)]
am
f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce
* commit '
f402ec180c7e5f406ee30075dc6dac7a90f9310e':
Update Pano XML tag and permission.
Justin Koh [Tue, 12 Mar 2013 19:09:46 +0000 (19:09 +0000)]
Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce
George Mount [Tue, 12 Mar 2013 18:50:43 +0000 (18:50 +0000)]
am
4891dde8: am
efc4f7dc: am
f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
* commit '
4891dde8597316b2c9828de569f60f8f555cdf3d':
Add support for local storage of uploaded pictures.
George Mount [Tue, 12 Mar 2013 18:49:23 +0000 (18:49 +0000)]
am
efc4f7dc: am
f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
* commit '
efc4f7dc3afb9211818f0cac6e702b49bc41336a':
Add support for local storage of uploaded pictures.
George Mount [Tue, 12 Mar 2013 18:45:20 +0000 (11:45 -0700)]
am
f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
* commit '
f450fb6b2130998cf7ee7eb3b82074cb3b37b1a0':
Add support for local storage of uploaded pictures.
George Mount [Tue, 12 Mar 2013 18:44:08 +0000 (18:44 +0000)]
Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
Michael Kolb [Tue, 12 Mar 2013 17:50:18 +0000 (17:50 +0000)]
am
7a0e735e: am
f3ca5b80: am
39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
* commit '
7a0e735e0afc116a6cd7a3b78da5d73d9af3aeff':
Open camera only once in Video module
Justin Koh [Tue, 12 Mar 2013 17:49:04 +0000 (10:49 -0700)]
Update Pano XML tag and permission.
Update Pano XML tag and permission.
Bug:
8359058
Change-Id: I92626f03f5c6857951d5f17fb6f811ffbc24e74f
Michael Kolb [Tue, 12 Mar 2013 17:49:00 +0000 (17:49 +0000)]
am
f3ca5b80: am
39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
* commit '
f3ca5b80749966e3c39336e9cfb5b76f1496204d':
Open camera only once in Video module
Michael Kolb [Tue, 12 Mar 2013 17:47:53 +0000 (10:47 -0700)]
am
39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
* commit '
39d2192d8c93b40e19f047bbd2bef24a3e987e44':
Open camera only once in Video module
Michael Kolb [Tue, 12 Mar 2013 17:46:42 +0000 (17:46 +0000)]
Merge "Open camera only once in Video module" into gb-ub-photos-bryce
Michael Kolb [Tue, 12 Mar 2013 17:42:56 +0000 (10:42 -0700)]
Open camera only once in Video module
Bug:
8272736
Change-Id: Id28fde5da62083651627dc8c734e818afe22a6e0
nicolasroard [Tue, 12 Mar 2013 17:02:35 +0000 (17:02 +0000)]
am
809d801b: am
30ba8145: am
b6b5b5a3: Fix potential problem with default rsc number
* commit '
809d801bcb3d9b47fd3a2751820c7e14d34e136d':
Fix potential problem with default rsc number
nicolasroard [Tue, 12 Mar 2013 16:59:59 +0000 (16:59 +0000)]
am
30ba8145: am
b6b5b5a3: Fix potential problem with default rsc number
* commit '
30ba81452a1d70b3c1697548337ecd6a3419fd5a':
Fix potential problem with default rsc number
nicolasroard [Tue, 12 Mar 2013 16:57:36 +0000 (09:57 -0700)]
am
b6b5b5a3: Fix potential problem with default rsc number
* commit '
b6b5b5a357710b19236d64fb4ee4438724d763a8':
Fix potential problem with default rsc number
nicolasroard [Tue, 12 Mar 2013 15:48:16 +0000 (15:48 +0000)]
am
5be99e68: am
a3f5378b: am
b2fcd425: Fix layout on phones
* commit '
5be99e6856fe7dc92bdd4a5e6764b093d635516c':
Fix layout on phones
nicolasroard [Tue, 12 Mar 2013 15:46:15 +0000 (08:46 -0700)]
Fix potential problem with default rsc number
Change-Id: I8205dbb2488232084f984a10963bb9286ff19e0e
nicolasroard [Tue, 12 Mar 2013 15:46:09 +0000 (15:46 +0000)]
am
a3f5378b: am
b2fcd425: Fix layout on phones
* commit '
a3f5378b0cc5f84243821856975afcee490e284a':
Fix layout on phones
nicolasroard [Tue, 12 Mar 2013 15:44:05 +0000 (08:44 -0700)]
am
b2fcd425: Fix layout on phones
* commit '
b2fcd4252cbcee124e68412bb53a8b875ce9ba36':
Fix layout on phones
George Mount [Mon, 11 Mar 2013 19:58:46 +0000 (12:58 -0700)]
Add support for local storage of uploaded pictures.
Change-Id: I23c86e6a95871effcb76a54b16b9ab7720a63383
The Android Open Source Project [Tue, 12 Mar 2013 14:16:33 +0000 (14:16 +0000)]
am
c2349abd: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
c2349abde4087ce2cb4b260d7ba7b26844365a2b':
Don't record video before preview is started
Fix camera switcher mode picker
fix undo bug
Fix NPE in switcher popup
The Android Open Source Project [Tue, 12 Mar 2013 14:14:59 +0000 (07:14 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iee469c89331fc9626c24bf2c42890c8abb7f1380
The Android Automerger [Tue, 12 Mar 2013 12:56:09 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Tue, 12 Mar 2013 04:04:30 +0000 (21:04 -0700)]
Fix layout on phones
Change-Id: I147b00f1abf032877c7461138ec78149bfd8b519
nicolasroard [Tue, 12 Mar 2013 03:51:28 +0000 (03:51 +0000)]
am
3974ae68: am
ad961df1: am
8d2c7ee0: Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don\'t load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
* commit '
3974ae689fafc2d19458416342e0da0915badd29':
Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
nicolasroard [Tue, 12 Mar 2013 03:49:24 +0000 (03:49 +0000)]
am
ad961df1: am
8d2c7ee0: Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don\'t load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
* commit '
ad961df1ae6c75ad767177db10f03dda2e6d3e65':
Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
nicolasroard [Tue, 12 Mar 2013 03:47:54 +0000 (20:47 -0700)]
am
8d2c7ee0: Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don\'t load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
* commit '
8d2c7ee02c8fde53effc787c172b10b14ae34d42':
Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
nicolasroard [Tue, 12 Mar 2013 02:16:03 +0000 (19:16 -0700)]
Various bugfixes/improvements for Fx Filters:
- fix bug in history with Fx filters
- don't load Fx bitmaps at startup
- free bitmaps when unneeded
- fix history preview bitmaps
Change-Id: I5631a5bcec12c121871b3575066c201486896a14
John Hoford [Tue, 12 Mar 2013 01:02:13 +0000 (01:02 +0000)]
am
9c300018: am
c0672b12: am
001283a7: fix menus for all editors
* commit '
9c3000187eb43746b2fa99c945b92e7bcc6e92d7':
fix menus for all editors
John Hoford [Tue, 12 Mar 2013 00:59:59 +0000 (00:59 +0000)]
am
c0672b12: am
001283a7: fix menus for all editors
* commit '
c0672b12dd63e8bc1d61a9e5a3dae80a2592ef49':
fix menus for all editors
John Hoford [Tue, 12 Mar 2013 00:58:02 +0000 (17:58 -0700)]
am
001283a7: fix menus for all editors
* commit '
001283a72d451999e3308f45dc365d4defc0af39':
fix menus for all editors
John Hoford [Mon, 11 Mar 2013 22:08:26 +0000 (15:08 -0700)]
fix menus for all editors
Change-Id: I93e7eef3176b38480d55df176166646709a875fe
Mangesh Ghiware [Mon, 11 Mar 2013 22:55:57 +0000 (22:55 +0000)]
am
2c5204e6: am
f35f4f62: am
dc32aaf9: Enable operations on accounts table.
* commit '
2c5204e6ef49ce196f7050e189957fc1581a4988':
Enable operations on accounts table.
Mangesh Ghiware [Mon, 11 Mar 2013 22:54:39 +0000 (22:54 +0000)]
am
f35f4f62: am
dc32aaf9: Enable operations on accounts table.
* commit '
f35f4f6262167dd715d2a8059e61403fe88e1f09':
Enable operations on accounts table.
Michael Kolb [Mon, 11 Mar 2013 19:37:40 +0000 (12:37 -0700)]
Don't record video before preview is started
Bug:
8358998
Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a
Mangesh Ghiware [Mon, 11 Mar 2013 22:52:19 +0000 (15:52 -0700)]
am
dc32aaf9: Enable operations on accounts table.
* commit '
dc32aaf95fd6925796474688c24704b3265a1ae7':
Enable operations on accounts table.
Mangesh Ghiware [Mon, 11 Mar 2013 22:44:56 +0000 (15:44 -0700)]
Enable operations on accounts table.
Change-Id: Ida0e379cad422dbeffb3b4ea89232db7f45a36e4
Michael Kolb [Mon, 11 Mar 2013 22:39:52 +0000 (22:39 +0000)]
am
c8ec0b60: am
ab608128: am
54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce
* commit '
c8ec0b60f87c56ebab2d6b8b90ef93ca86bea6e6':
Spring cleaning
John Hoford [Mon, 11 Mar 2013 22:39:52 +0000 (22:39 +0000)]
am
68c5119f: am
c84552dd: am
6f3ff5b4: split filter show into multiple files
* commit '
68c5119fd4d407e4ad181afbf938e9718f5dd71a':
split filter show into multiple files
Michael Kolb [Mon, 11 Mar 2013 22:37:32 +0000 (22:37 +0000)]
am
ab608128: am
54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce
* commit '
ab60812856e3181e3e1748259b1c1b155de4a1c8':
Spring cleaning
John Hoford [Mon, 11 Mar 2013 22:37:32 +0000 (22:37 +0000)]
am
c84552dd: am
6f3ff5b4: split filter show into multiple files
* commit '
c84552ddd45b79f0b04a7bd5b148c3154512e9c1':
split filter show into multiple files
Michael Kolb [Mon, 11 Mar 2013 22:36:03 +0000 (15:36 -0700)]
am
54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce
* commit '
54c1256ffd0f578f4b33680c54d50ab6901d9098':
Spring cleaning
John Hoford [Mon, 11 Mar 2013 22:36:02 +0000 (15:36 -0700)]
am
6f3ff5b4: split filter show into multiple files
* commit '
6f3ff5b486e30221361afd066510a7374962fd09':
split filter show into multiple files
Michael Kolb [Mon, 11 Mar 2013 22:35:00 +0000 (22:35 +0000)]
Merge "Spring cleaning" into gb-ub-photos-bryce
John Hoford [Mon, 11 Mar 2013 22:08:26 +0000 (15:08 -0700)]
split filter show into multiple files
Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535
Michael Kolb [Sat, 9 Mar 2013 04:43:01 +0000 (20:43 -0800)]
Spring cleaning
Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a
John Hoford [Mon, 11 Mar 2013 21:44:50 +0000 (21:44 +0000)]
am
a937e06e: am
0364b363: am
6a07dfbe: refactoring to make Editor classes do more
* commit '
a937e06ed6cdd83aa3f6dcba90e89b7e45f363f1':
refactoring to make Editor classes do more
John Hoford [Mon, 11 Mar 2013 21:42:48 +0000 (21:42 +0000)]
am
0364b363: am
6a07dfbe: refactoring to make Editor classes do more
* commit '
0364b363468ee047ce7ac02134424837048ac6df':
refactoring to make Editor classes do more
John Hoford [Mon, 11 Mar 2013 21:39:33 +0000 (14:39 -0700)]
am
6a07dfbe: refactoring to make Editor classes do more
* commit '
6a07dfbe03c8396cc43840a1630ea480a2cff663':
refactoring to make Editor classes do more
John Hoford [Mon, 11 Mar 2013 18:10:22 +0000 (11:10 -0700)]
refactoring to make Editor classes do more
Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:17:58 +0000 (20:17 +0000)]
am
464aa220: (-s ours) am
9c2e42a2: am
009b0502: am
63e1a5a9: am
4c13ac43: am
73d8e5d2: (-s ours) am
63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
464aa220ca5b6f2b392d742e95edca7e1a86dc12':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:31 +0000 (20:13 +0000)]
am
9c2e42a2: am
009b0502: am
63e1a5a9: am
4c13ac43: am
73d8e5d2: (-s ours) am
63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9c2e42a2ed84f668bd759190481c5144421f1fd8':
Michael Kolb [Mon, 11 Mar 2013 20:13:30 +0000 (20:13 +0000)]
am
86d50ea5: am
4a9152a0: am
de175c80: Don\'t record video before preview is started
* commit '
86d50ea5a8a86edd4f3ce2ecf9687fb0d965615b':
Don't record video before preview is started
Michael Kolb [Mon, 11 Mar 2013 20:07:44 +0000 (20:07 +0000)]
am
4a9152a0: am
de175c80: Don\'t record video before preview is started
* commit '
4a9152a04ffdc20407cc11978e4dd92ec1128c1e':
Don't record video before preview is started
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:07:32 +0000 (13:07 -0700)]
am
009b0502: am
63e1a5a9: am
4c13ac43: am
73d8e5d2: (-s ours) am
63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
009b05028ced67523e257a2abbdc5c07776f0ceb':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:46 +0000 (13:00 -0700)]
am
63e1a5a9: am
4c13ac43: am
73d8e5d2: (-s ours) am
63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
63e1a5a9076f90e9e704e06956ba414a1d28c6a3':
Michael Kolb [Mon, 11 Mar 2013 20:00:00 +0000 (13:00 -0700)]
am
de175c80: Don\'t record video before preview is started
* commit '
de175c806c524e08b4ca7c6ec991a5610c3856d9':
Don't record video before preview is started
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:56:10 +0000 (12:56 -0700)]
am
4c13ac43: am
73d8e5d2: (-s ours) am
63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
4c13ac4382d3bde4eb8b3c448a8ee6cb05a541d0':
Michael Kolb [Mon, 11 Mar 2013 19:37:40 +0000 (12:37 -0700)]
Don't record video before preview is started
Bug:
8358998
Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:55 +0000 (12:41 -0700)]
am
73d8e5d2: (-s ours) am
63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
73d8e5d2652b7fd50361d4fc4542140c62591404':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:27:37 +0000 (12:27 -0700)]
am
63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
63da0db6333796d7b3a94af55de58039cea94b8d':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:21:38 +0000 (12:21 -0700)]
Reconcile with jb-mr1-release - do not merge
Ruben Brunk [Mon, 11 Mar 2013 19:19:30 +0000 (19:19 +0000)]
am
9dd535cd: am
9941f7f6: am
f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor.
* commit '
9dd535cdd1c712c4a67452a271332235c2c0a969':
Clear Gallery's bitmap pool before starting photoeditor.
Ruben Brunk [Mon, 11 Mar 2013 19:18:02 +0000 (19:18 +0000)]
am
9941f7f6: am
f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor.
* commit '
9941f7f6d254580b23832b16ddbe9f93e26d443c':
Clear Gallery's bitmap pool before starting photoeditor.
Ruben Brunk [Mon, 11 Mar 2013 19:14:41 +0000 (12:14 -0700)]
am
f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor.
* commit '
f07bb27436a65b233c1caf4aa06c6257a9cf4046':
Clear Gallery's bitmap pool before starting photoeditor.
Ruben Brunk [Mon, 11 Mar 2013 19:00:06 +0000 (12:00 -0700)]
Clear Gallery's bitmap pool before starting photoeditor.
Change-Id: Iaa1f559db12ba22e53673b2e9fe2c3fbabf33514
Ruben Brunk [Mon, 11 Mar 2013 18:49:20 +0000 (18:49 +0000)]
am
4e04979c: am
4e47e35b: am
5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce
* commit '
4e04979c13201368e82a3ed2052d7406beb714fe':
Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
Ruben Brunk [Mon, 11 Mar 2013 18:47:21 +0000 (18:47 +0000)]
am
4e47e35b: am
5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce
* commit '
4e47e35b259a3b52db8d23a1d9f76842d8c76566':
Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
Ruben Brunk [Mon, 11 Mar 2013 18:45:08 +0000 (11:45 -0700)]
am
5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce
* commit '
5a17cc93c3a34f0494eaa38353c0ac727086222d':
Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
Ruben Brunk [Mon, 11 Mar 2013 18:42:41 +0000 (18:42 +0000)]
Merge "Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce
Ruben Brunk [Mon, 11 Mar 2013 18:42:37 +0000 (18:42 +0000)]
am
0ec2298d: am
549f55a8: am
9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce
* commit '
0ec2298d848791d5ac3114f73f780902ad95d123':
Clear Gallery's bitmap pool on photo editor start. Minor refactoring.
Ruben Brunk [Mon, 11 Mar 2013 18:41:39 +0000 (18:41 +0000)]
Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
This reverts commit
65948b17607d6fab9a2561749a90e16889fd1eea
Change-Id: Iea682767fced173fe56dd6e91244f0ef70d1f74b
Ruben Brunk [Mon, 11 Mar 2013 18:40:56 +0000 (18:40 +0000)]
am
549f55a8: am
9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce
* commit '
549f55a82bc26d9a681434e2f08706c3f5c3fe39':
Clear Gallery's bitmap pool on photo editor start. Minor refactoring.
Ruben Brunk [Mon, 11 Mar 2013 18:38:59 +0000 (11:38 -0700)]
am
9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce
* commit '
9ecbf66d54204f78e9b51bee6f76d2bde1dc6882':
Clear Gallery's bitmap pool on photo editor start. Minor refactoring.
Ruben Brunk [Mon, 11 Mar 2013 18:37:55 +0000 (18:37 +0000)]
Merge "Clear Gallery's bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce
Ruben Brunk [Mon, 11 Mar 2013 16:53:16 +0000 (09:53 -0700)]
Clear Gallery's bitmap pool on photo editor start. Minor refactoring.
Change-Id: I02e29bf6cfd85a9cecd3850f8828cccae91badd2
nicolasroard [Mon, 11 Mar 2013 17:43:52 +0000 (17:43 +0000)]
am
84814bc9: am
41a8581c: am
6019ad95: Add tiled background
* commit '
84814bc98446c9ff6e3e299e4c167a06f9f89649':
Add tiled background
nicolasroard [Mon, 11 Mar 2013 17:41:48 +0000 (17:41 +0000)]
am
41a8581c: am
6019ad95: Add tiled background
* commit '
41a8581cdb2eea01b996936b44a83211a18b06a5':
Add tiled background
nicolasroard [Mon, 11 Mar 2013 17:39:40 +0000 (10:39 -0700)]
am
6019ad95: Add tiled background
* commit '
6019ad95f1c85786488d2d4cae1cbb665d33bd30':
Add tiled background
nicolasroard [Sat, 9 Mar 2013 19:18:43 +0000 (11:18 -0800)]
Add tiled background
Change-Id: I52292f6cae4f1121795829663dc4738cb38a953b
The Android Automerger [Mon, 11 Mar 2013 12:56:28 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Sat, 9 Mar 2013 18:19:52 +0000 (18:19 +0000)]
am
253e6e22: am
776d8751: am
402dd963: Clear border resources to save memory
* commit '
253e6e224c06c398c00e0814b23b8ee7c8a0456e':
Clear border resources to save memory
nicolasroard [Sat, 9 Mar 2013 18:17:47 +0000 (18:17 +0000)]
am
776d8751: am
402dd963: Clear border resources to save memory
* commit '
776d87513f87608c340ad12ec12775ae47ea94ce':
Clear border resources to save memory
nicolasroard [Sat, 9 Mar 2013 18:15:25 +0000 (10:15 -0800)]
am
402dd963: Clear border resources to save memory
* commit '
402dd963ad8fb1dfed81cca63cbaf82e93533a94':
Clear border resources to save memory
nicolasroard [Sat, 9 Mar 2013 18:06:49 +0000 (10:06 -0800)]
Clear border resources to save memory
Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2
nicolasroard [Sat, 9 Mar 2013 01:34:51 +0000 (01:34 +0000)]
am
0b917145: am
45a47c33: am
259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce
* commit '
0b9171455ca5718292c5f2f573a15432bccf480c':
Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup
nicolasroard [Sat, 9 Mar 2013 01:33:38 +0000 (01:33 +0000)]
am
45a47c33: am
259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce
* commit '
45a47c33942bcee9b51597e032bd1ebf330050e9':
Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup
nicolasroard [Sat, 9 Mar 2013 01:32:36 +0000 (17:32 -0800)]
am
259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce
* commit '
259bb0f4a960d87bc0d3fa7d3b9f626bf1f16d0c':
Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup
nicolasroard [Sat, 9 Mar 2013 01:31:02 +0000 (01:31 +0000)]
Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce
OSDN Git Service
