OSDN Git Service
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 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 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: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: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: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: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: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: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: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: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: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: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: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
nicolasroard [Thu, 7 Mar 2013 23:16:59 +0000 (15:16 -0800)]
Memory usage improvements, speed improvement
- free filters resources agressively
- implements multiple rendering pipelines
- some cleanup
Change-Id: Ib9ed268b0b2662d0bf5c049adcf046b556954c37
Bobby Georgescu [Fri, 8 Mar 2013 23:49:12 +0000 (23:49 +0000)]
am
77f26894: am
08157c9c: Merge "Add sharing support" into gb-ub-photos-bryce
* commit '
77f268944a6c3262f4aeabbfe5ae2a904c0bc5c0':
Add sharing support
Bobby Georgescu [Fri, 8 Mar 2013 23:47:58 +0000 (15:47 -0800)]
am
08157c9c: Merge "Add sharing support" into gb-ub-photos-bryce
* commit '
08157c9c2a1eb63dabd756f49e7b8fefe4b25c50':
Add sharing support
Bobby Georgescu [Fri, 8 Mar 2013 23:46:23 +0000 (23:46 +0000)]
Merge "Add sharing support" into gb-ub-photos-bryce
Bobby Georgescu [Thu, 7 Mar 2013 22:15:57 +0000 (14:15 -0800)]
Add sharing support
Change-Id: I2c7f18b0d6dd057c1fba96c1133d563f32abf55c
nicolasroard [Fri, 8 Mar 2013 23:32:14 +0000 (23:32 +0000)]
am
6414da1c: am
0f1d09c9: Merge "Implements double-tap to zoom" into gb-ub-photos-bryce
* commit '
6414da1cd348f2d5551e2af1c4a6a7a614951ecc':
Implements double-tap to zoom
nicolasroard [Fri, 8 Mar 2013 23:30:27 +0000 (15:30 -0800)]
am
0f1d09c9: Merge "Implements double-tap to zoom" into gb-ub-photos-bryce
* commit '
0f1d09c93b961369a0e6aef7b6ec708052099e21':
Implements double-tap to zoom
nicolasroard [Fri, 8 Mar 2013 23:28:51 +0000 (23:28 +0000)]
Merge "Implements double-tap to zoom" into gb-ub-photos-bryce
Bart Sears [Fri, 8 Mar 2013 22:46:57 +0000 (22:46 +0000)]
am
a4e10299: am
db2a1e4d: Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce
* commit '
a4e10299bb6f5591d8b2badb78688b745a281f47':
Bump up the version number to 1.1.40004
John Reck [Fri, 8 Mar 2013 22:46:50 +0000 (22:46 +0000)]
am
388eea50: am
f6e687bc: Support clicking on photos to view them
* commit '
388eea509400e46428a0b0ec1c46a9b0703e4ec5':
Support clicking on photos to view them
Bart Sears [Fri, 8 Mar 2013 22:19:48 +0000 (14:19 -0800)]
am
db2a1e4d: Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce
* commit '
db2a1e4d1091f3422845d48d4b24cb6995fc68f8':
Bump up the version number to 1.1.40004
Bart Sears [Fri, 8 Mar 2013 22:18:01 +0000 (22:18 +0000)]
Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce
Bart Sears [Fri, 8 Mar 2013 21:49:24 +0000 (13:49 -0800)]
Bump up the version number to 1.1.40004
Change-Id: If5e430e9877c6b881f33893a544313eff0647ce5
John Reck [Fri, 8 Mar 2013 21:08:23 +0000 (13:08 -0800)]
am
f6e687bc: Support clicking on photos to view them
* commit '
f6e687bc30887695374580712092aeb917c84253':
Support clicking on photos to view them
John Reck [Fri, 8 Mar 2013 19:19:27 +0000 (11:19 -0800)]
Support clicking on photos to view them
Change-Id: I511af0cbe46c833d81cbbd563b9c2b4feec2bffe
John Reck [Fri, 8 Mar 2013 18:49:43 +0000 (18:49 +0000)]
am
d675ab59: am
d3d2e276: Support rotation
* commit '
d675ab593a3eeb46f1fccde621804263cf6babe4':
Support rotation
John Reck [Fri, 8 Mar 2013 18:48:28 +0000 (10:48 -0800)]
am
d3d2e276: Support rotation
* commit '
d3d2e2763bb4187a2dd3ac350d3a3c51d092890a':
Support rotation
John Reck [Fri, 8 Mar 2013 02:07:05 +0000 (18:07 -0800)]
Support rotation
Change-Id: Ic93bed50851f788803124ea2453128fd0497a746
John Reck [Fri, 8 Mar 2013 01:38:27 +0000 (01:38 +0000)]
am
b9efb190: am
f1787e59: Merge "Fix stuff" into gb-ub-photos-bryce
* commit '
b9efb190b871e2f0eddef15da02b7030217d32ae':
Fix stuff
John Reck [Fri, 8 Mar 2013 01:36:40 +0000 (17:36 -0800)]
am
f1787e59: Merge "Fix stuff" into gb-ub-photos-bryce
* commit '
f1787e59ee4a6da2604d33eae36e59c15eee7523':
Fix stuff
John Reck [Fri, 8 Mar 2013 01:34:24 +0000 (01:34 +0000)]
Merge "Fix stuff" into gb-ub-photos-bryce
John Reck [Thu, 7 Mar 2013 23:50:38 +0000 (15:50 -0800)]
Fix stuff
Change-Id: Ib263a00a13f169388e6ee796359255fda2a26b37
Bobby Georgescu [Thu, 7 Mar 2013 23:50:27 +0000 (23:50 +0000)]
am
9b4da3bf: am
33a5a21f: Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce
* commit '
9b4da3bf17dfebd5a94c6e6cbc2fe77d051a9cd2':
Add possibility for UX improvement measurements
Bobby Georgescu [Thu, 7 Mar 2013 23:46:58 +0000 (15:46 -0800)]
am
33a5a21f: Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce
* commit '
33a5a21f513209bd6261b88b060e63ed044b7755':
Add possibility for UX improvement measurements
Bobby Georgescu [Thu, 7 Mar 2013 23:44:43 +0000 (23:44 +0000)]
Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce
Tim Murray [Thu, 7 Mar 2013 22:44:43 +0000 (22:44 +0000)]
am
d11b5c3f: am
de72a83d: Merge "Add convertRGBAtoA." into gb-ub-photos-bryce
* commit '
d11b5c3f37cc1903e953fae0aed3cd9a964e297d':
Add convertRGBAtoA.
Tim Murray [Thu, 7 Mar 2013 22:43:13 +0000 (14:43 -0800)]
am
de72a83d: Merge "Add convertRGBAtoA." into gb-ub-photos-bryce
* commit '
de72a83d12de1183c8382c609af2da6ac829c011':
Add convertRGBAtoA.
Tim Murray [Thu, 7 Mar 2013 22:41:46 +0000 (22:41 +0000)]
Merge "Add convertRGBAtoA." into gb-ub-photos-bryce
Bobby Georgescu [Thu, 7 Mar 2013 22:22:10 +0000 (22:22 +0000)]
am
88f8328b: am
62a1046c: Merge "Album set shim" into gb-ub-photos-bryce
* commit '
88f8328bf03ea1e037c4160a866655bc3851850f':
Album set shim
Bobby Georgescu [Thu, 7 Mar 2013 22:16:48 +0000 (14:16 -0800)]
am
62a1046c: Merge "Album set shim" into gb-ub-photos-bryce
* commit '
62a1046c9482b4ac54d73130623ba7e37da2f275':
Album set shim
Bobby Georgescu [Thu, 7 Mar 2013 22:14:59 +0000 (22:14 +0000)]
Merge "Album set shim" into gb-ub-photos-bryce
Tim Murray [Thu, 7 Mar 2013 22:00:45 +0000 (14:00 -0800)]
Add convertRGBAtoA.
Change-Id: I358bc0517480883c470df51189f46fb238fde101
George Mount [Thu, 7 Mar 2013 21:58:10 +0000 (21:58 +0000)]
am
5a95ad86: am
6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce
* commit '
5a95ad869eedac439c1f9ef21c48cc0eb28e30fa':
Add batch operations to PhotoProvider
George Mount [Thu, 7 Mar 2013 21:56:14 +0000 (13:56 -0800)]
am
6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce
* commit '
6f3bd23d7fd83a67f5e357939b06057f40051df3':
Add batch operations to PhotoProvider
George Mount [Thu, 7 Mar 2013 21:54:29 +0000 (21:54 +0000)]
Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce
George Mount [Thu, 7 Mar 2013 17:02:26 +0000 (09:02 -0800)]
Add batch operations to PhotoProvider
Change-Id: I36b2f0305e2ef7502df7b896c8baedc86519ac52
Bobby Georgescu [Thu, 7 Mar 2013 03:54:37 +0000 (19:54 -0800)]
Album set shim
Change-Id: I12257ea09b7b5bc4b1d5ef638e685c66df86538a
John Reck [Thu, 7 Mar 2013 19:05:22 +0000 (19:05 +0000)]
John Reck [Thu, 7 Mar 2013 19:03:22 +0000 (11:03 -0800)]
am
2ff8d800: recycle bitmaps
* commit '
2ff8d80018c27abdd475a7610ab3d684c4b33acb':
recycle bitmaps
John Reck [Thu, 7 Mar 2013 19:00:29 +0000 (11:00 -0800)]
recycle bitmaps
Change-Id: I3afda4f009fda07b4e2858cb65dee4444f8484e5
Mangesh Ghiware [Thu, 7 Mar 2013 17:35:55 +0000 (17:35 +0000)]
am
c1c711ee: am
17362f81: Remove redundant Album NAME (replaced by TITLE)
* commit '
c1c711ee1eb7d0de4a886020e9da9f9cd5212968':
Remove redundant Album NAME (replaced by TITLE)
Mangesh Ghiware [Thu, 7 Mar 2013 17:31:31 +0000 (09:31 -0800)]
am
17362f81: Remove redundant Album NAME (replaced by TITLE)
* commit '
17362f811fa92ff0d9f92b3c733f08704de2f135':
Remove redundant Album NAME (replaced by TITLE)
George Mount [Thu, 7 Mar 2013 17:31:10 +0000 (17:31 +0000)]
am
404219e5: am
cad2ab01: Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce
* commit '
404219e55171b6fcfb666f16174b41fa25fba794':
Add inserts to PhotoProvider.
George Mount [Thu, 7 Mar 2013 17:31:10 +0000 (17:31 +0000)]
am
d258438c: am
e1796ac1: Merge "Add album cover art downloading." into gb-ub-photos-bryce
* commit '
d258438cbfedb5184adcfd9238f28299de1c38a3':
Add album cover art downloading.
Baligh Uddin [Thu, 7 Mar 2013 17:30:56 +0000 (17:30 +0000)]
am
2fee25d9: am
7607b9a9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
2fee25d93cbdabfb87152038b3ea788d9895921b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 7 Mar 2013 17:30:56 +0000 (17:30 +0000)]
am
956d934e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
956d934ebf9307d350babad7cc49dc33c7e8b2c7':
Import translations. DO NOT MERGE
Mangesh Ghiware [Thu, 7 Mar 2013 16:55:18 +0000 (08:55 -0800)]
Remove redundant Album NAME (replaced by TITLE)
Change-Id: I0482f8b4bd85e07aefe4af02b1e8dab4702eb9f6
OSDN Git Service
