OSDN Git Service
Ying Wang [Fri, 8 Feb 2013 01:52:38 +0000 (17:52 -0800)]
Fix build.
Change-Id: I1c7e931fb1119dc9c1b207d447320dec3a6d6f6b
nicolasroard [Fri, 8 Feb 2013 01:28:56 +0000 (17:28 -0800)]
am
41a03af3: Add todo
# Via nicolasroard
* commit '
41a03af3dec8915b5055570ad0631071346da40f':
Add todo
nicolasroard [Fri, 8 Feb 2013 01:25:40 +0000 (17:25 -0800)]
am
933f357a: Merge "Fix Fx filters" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
933f357aeeeba53ed9d3267107ab52dcb4a0fe5f':
Fix Fx filters
nicolasroard [Fri, 8 Feb 2013 01:25:04 +0000 (17:25 -0800)]
Add todo
Change-Id: I54fd72da364337833f80a0f1913beadf2af74277
nicolasroard [Fri, 8 Feb 2013 01:23:36 +0000 (01:23 +0000)]
Merge "Fix Fx filters" into gb-ub-photos-bryce
nicolasroard [Fri, 8 Feb 2013 00:59:29 +0000 (16:59 -0800)]
Fix Fx filters
Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea
John Hoford [Thu, 7 Feb 2013 22:46:54 +0000 (14:46 -0800)]
am
b3825a60: Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Hoford (1)
* commit '
b3825a60032bc7b039b1f45fb280ea4c36ead766':
fix draw and curves to use FilterRepresentation
Jason Noguchi [Thu, 7 Feb 2013 22:46:53 +0000 (14:46 -0800)]
am
1933d8b2: Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Jason Noguchi (1)
* commit '
1933d8b2cc7c8f0c5fe5282a3cd463cd6c4bf95a':
Remove reference to local libraries. Make CameraTest build against the SDK instead.
John Hoford [Thu, 7 Feb 2013 22:45:00 +0000 (22:45 +0000)]
Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce
Jason Noguchi [Thu, 7 Feb 2013 22:44:54 +0000 (22:44 +0000)]
Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce
John Hoford [Tue, 5 Feb 2013 17:09:04 +0000 (09:09 -0800)]
fix draw and curves to use FilterRepresentation
Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349
Doris Liu [Thu, 7 Feb 2013 21:53:16 +0000 (13:53 -0800)]
am
1fe1cc71: Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Doris Liu (1)
* commit '
1fe1cc71a06f677e3715a62fd29692fcc7a424aa':
Fix memory leak in ComboPreferences
Doris Liu [Thu, 7 Feb 2013 21:51:20 +0000 (21:51 +0000)]
Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce
Doris Liu [Thu, 7 Feb 2013 20:32:42 +0000 (12:32 -0800)]
Fix memory leak in ComboPreferences
Bug:
8028546
Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185
Jason Noguchi [Thu, 7 Feb 2013 02:49:51 +0000 (18:49 -0800)]
Remove reference to local libraries. Make CameraTest build against the SDK instead.
Change-Id: I5885de7f569f4c0e1e5156d8a1634fc13c1b558d
nicolasroard [Thu, 7 Feb 2013 20:04:13 +0000 (12:04 -0800)]
am
a31f446d: Fix flashing on geometry preview
# Via nicolasroard
* commit '
a31f446dca49c0915f8a08456d7bb7abe6f3037d':
Fix flashing on geometry preview
nicolasroard [Thu, 7 Feb 2013 20:01:59 +0000 (12:01 -0800)]
Fix flashing on geometry preview
Change-Id: I0f05d654c1c4373016d2d5766eb983a47fab2780
nicolasroard [Thu, 7 Feb 2013 19:49:58 +0000 (11:49 -0800)]
am
00fa330e: Merge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
00fa330e9497157542e4867ee033badaaf1f224f':
Fix filters only + geometry only rendering
nicolasroard [Thu, 7 Feb 2013 19:47:37 +0000 (19:47 +0000)]
Merge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce
nicolasroard [Thu, 7 Feb 2013 02:40:09 +0000 (18:40 -0800)]
Fix filters only + geometry only rendering
Change-Id: Id8f0637ae53864488cb931def196ee50ae807f5c
John Reck [Thu, 7 Feb 2013 01:14:41 +0000 (17:14 -0800)]
am
ec43f01d: Merge "Request GALLERY_PROVIDER permission" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Reck (1)
* commit '
ec43f01d751af2010446d83db0db2c0654a21a6e':
Request GALLERY_PROVIDER permission
John Reck [Thu, 7 Feb 2013 01:12:36 +0000 (01:12 +0000)]
Merge "Request GALLERY_PROVIDER permission" into gb-ub-photos-bryce
Marco Nelissen [Wed, 6 Feb 2013 23:58:27 +0000 (23:58 +0000)]
Merge "Don't call requestLayout from onLayout"
Marco Nelissen [Wed, 6 Feb 2013 23:35:52 +0000 (15:35 -0800)]
Don't call requestLayout from onLayout
Doing a layout within a layout can lead to various problems, so it should
be avoided. There's some logging that warns of this, which got triggered
by CommonControllerOverlay.
I don't know what problem this code was originally trying to solve, but it
doesn't seem to be necessary anymore. The line in question was originally
introduced in change
209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011.
Change-Id: I1402a842df59df31b69ad981337ea1c8630103df
John Reck [Wed, 6 Feb 2013 21:18:47 +0000 (13:18 -0800)]
Request GALLERY_PROVIDER permission
Bug:
8138594
Change-Id: I39f446f8066cf15a62acf3f16c0faa84bc4b71d7
nicolasroard [Wed, 6 Feb 2013 21:05:25 +0000 (13:05 -0800)]
am
cf0b2aad: Refactor to use direct manipulations of FilterRepresentations.
# Via nicolasroard
* commit '
cf0b2aad3bc5d80c51316ae10e1cf2c3476259aa':
Refactor to use direct manipulations of FilterRepresentations.
nicolasroard [Wed, 6 Feb 2013 01:09:05 +0000 (17:09 -0800)]
Refactor to use direct manipulations of FilterRepresentations.
Change-Id: If5f92f137283cb126835be004d315942ff95021c
nicolasroard [Tue, 5 Feb 2013 22:00:16 +0000 (14:00 -0800)]
am
5b85b092: fix editor visibility
# Via nicolasroard
* commit '
5b85b092af404effd32aa513f9c45a0232d7ae81':
fix editor visibility
nicolasroard [Tue, 5 Feb 2013 21:44:59 +0000 (13:44 -0800)]
am
1c82642e: Merge "Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
1c82642e74b9a8cec93f3fb0ecb2d06ec4593a76':
Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle
nicolasroard [Tue, 5 Feb 2013 21:43:45 +0000 (13:43 -0800)]
fix editor visibility
Change-Id: I0c9c5273b49974884b8bdf365211b33de54c5598
nicolasroard [Tue, 5 Feb 2013 21:42:40 +0000 (21:42 +0000)]
Merge "Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle" into gb-ub-photos-bryce
John Reck [Tue, 5 Feb 2013 21:20:38 +0000 (13:20 -0800)]
am
008e0bd1: Merge "Cleanup" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Reck (1)
* commit '
008e0bd1c0dee2f76dd46f02bbc4efc9efcdfc35':
Cleanup
John Reck [Tue, 5 Feb 2013 21:18:14 +0000 (21:18 +0000)]
Merge "Cleanup" into gb-ub-photos-bryce
John Reck [Tue, 5 Feb 2013 18:44:51 +0000 (10:44 -0800)]
Cleanup
Move Canvas to com.android.photos.canvas
Remove workaround for b/
8079561
Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
Baligh Uddin [Tue, 5 Feb 2013 20:15:11 +0000 (12:15 -0800)]
am
24756077: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
247560770ac07eee9a09a5d9b857d0780873996f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Feb 2013 20:15:11 +0000 (12:15 -0800)]
am
9216e070: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
9216e0707c840dd3ab5e7f774bd8d9f615c1dcff':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 5 Feb 2013 20:14:01 +0000 (20:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 5 Feb 2013 20:13:48 +0000 (20:13 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 5 Feb 2013 20:13:31 +0000 (20:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 5 Feb 2013 20:13:14 +0000 (20:13 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 00:36:46 +0000 (16:36 -0800)]
Refactor filters parameters
- introduce FilterRepresentations
- change filters lifecycle
Change-Id: I9416fca47a334d532a347cd5577795738c870933
Stephen Hines [Tue, 5 Feb 2013 02:51:52 +0000 (18:51 -0800)]
am
a93d5839: Merge "Remove RS intermediates to trigger a clean build." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '
a93d583970819f2bea4b12f1233655fb9ede3387':
Remove RS intermediates to trigger a clean build.
Stephen Hines [Tue, 5 Feb 2013 02:49:48 +0000 (02:49 +0000)]
Merge "Remove RS intermediates to trigger a clean build." into gb-ub-photos-bryce
Stephen Hines [Tue, 5 Feb 2013 02:19:04 +0000 (18:19 -0800)]
Remove RS intermediates to trigger a clean build.
Change-Id: I4925dbf21b81876bac85413f8057049e84ca324c
John Reck [Tue, 5 Feb 2013 02:01:28 +0000 (18:01 -0800)]
am
7d072016: Merge "Handle syncing better" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Reck (1)
* commit '
7d07201654ef965f3fe2e322a857fc911cc54ec9':
Handle syncing better
John Reck [Tue, 5 Feb 2013 02:00:38 +0000 (02:00 +0000)]
Merge "Handle syncing better" into gb-ub-photos-bryce
John Reck [Tue, 5 Feb 2013 01:18:32 +0000 (17:18 -0800)]
Handle syncing better
Bug:
8104531
Limit to every 15 minutes
Avoid requesting a sync on a MediaSet that's already syncing
Change-Id: Iac4522cd305c64696317cc7088b0e851a2b81893
Tim Murray [Mon, 4 Feb 2013 22:39:15 +0000 (14:39 -0800)]
am
a6405169: Switch Gallery over to RS compatibility library.
# Via Tim Murray
* commit '
a64051696e46fb5d5e1c76e53ac95a4feba18585':
Switch Gallery over to RS compatibility library.
Tim Murray [Mon, 4 Feb 2013 21:09:27 +0000 (13:09 -0800)]
Switch Gallery over to RS compatibility library.
Change-Id: If27809236534f3b196949bf455faed45c99f3da5
Baligh Uddin [Mon, 4 Feb 2013 18:14:31 +0000 (10:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I576ed60925aa03ef01b65b5c9e9c739ec07702c5
Auto-generated-cl: translation import
Baligh Uddin [Mon, 4 Feb 2013 18:14:06 +0000 (10:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I25498bf6ba9f7c4987fb5c49efff040eb5068b31
Auto-generated-cl: translation import
Baligh Uddin [Mon, 4 Feb 2013 18:13:39 +0000 (10:13 -0800)]
Import translations. DO NOT MERGE
Change-Id: I890a7d57713b2e5aa3c5aada1710384c76a7bba5
Auto-generated-cl: translation import
Baligh Uddin [Mon, 4 Feb 2013 18:12:59 +0000 (10:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie03d9483555fe0f4ac4d444be4cf1eef647c6e63
Auto-generated-cl: translation import
John Hoford [Sat, 2 Feb 2013 00:49:16 +0000 (16:49 -0800)]
am
87e889b1: fix performance problem with large images in draw
# Via John Hoford
* commit '
87e889b195de98334048bb70bb1263a2ab76c76a':
fix performance problem with large images in draw
John Hoford [Sat, 2 Feb 2013 00:22:50 +0000 (16:22 -0800)]
fix performance problem with large images in draw
Change-Id: I9fa5a90e58273c6dd6e80d7d0bf07c3371a6f10e
John Hoford [Fri, 1 Feb 2013 22:24:44 +0000 (14:24 -0800)]
am
ff7743f5: Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Hoford (1)
* commit '
ff7743f592fa5499acdbbbb9a0d303ace6f6e08b':
fix sharpen to work under the new system
nicolasroard [Fri, 1 Feb 2013 22:24:43 +0000 (14:24 -0800)]
am
c47b572a: Merge "Fix async loading of borders" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
c47b572abf302992bbdee33f9e36be8de1dfcb6a':
Fix async loading of borders
Doris Liu [Fri, 1 Feb 2013 22:24:41 +0000 (14:24 -0800)]
am
46526e49: Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Doris Liu (1)
* commit '
46526e49de8f0a68e107cae2f64c70f8123f2249':
Move tests from camera to gallery2
John Hoford [Fri, 1 Feb 2013 21:56:26 +0000 (21:56 +0000)]
Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce
nicolasroard [Fri, 1 Feb 2013 21:51:43 +0000 (21:51 +0000)]
Merge "Fix async loading of borders" into gb-ub-photos-bryce
John Hoford [Fri, 1 Feb 2013 21:41:16 +0000 (13:41 -0800)]
fix sharpen to work under the new system
Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19
nicolasroard [Fri, 1 Feb 2013 21:48:21 +0000 (13:48 -0800)]
Fix async loading of borders
bug:
8099597
Change-Id: I62584c87eff03539ec50aafafda4238850b4f743
Doris Liu [Fri, 1 Feb 2013 21:22:25 +0000 (21:22 +0000)]
Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce
Doris Liu [Fri, 1 Feb 2013 03:03:48 +0000 (19:03 -0800)]
Move tests from camera to gallery2
Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9
Baligh Uddin [Fri, 1 Feb 2013 18:35:01 +0000 (10:35 -0800)]
am
55aae5be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
55aae5be9edcb95aed62106018671e68c3f42bda':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Feb 2013 18:35:00 +0000 (10:35 -0800)]
am
b8c62c9e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Baligh Uddin (1)
* commit '
b8c62c9ee6ff9c31151860047857fd13b1930a6d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 1 Feb 2013 18:32:29 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 1 Feb 2013 18:31:59 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 1 Feb 2013 18:31:44 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 1 Feb 2013 18:31:02 +0000 (18:31 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Angus Kong [Fri, 1 Feb 2013 18:22:34 +0000 (10:22 -0800)]
am
2007faf1: Merge "Make video snapshot save images in the background." into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Angus Kong (1)
* commit '
2007faf1f1f6f3aa589d907ff3416a671cea9abc':
Make video snapshot save images in the background.
John Hoford [Fri, 1 Feb 2013 18:22:33 +0000 (10:22 -0800)]
am
1b1a79f1: Fix curves refresh bug
# Via John Hoford
* commit '
1b1a79f1ccb6f847d017a72fa4c288b2195ffd99':
Fix curves refresh bug
Angus Kong [Fri, 1 Feb 2013 18:19:57 +0000 (18:19 +0000)]
Merge "Make video snapshot save images in the background." into gb-ub-photos-bryce
John Hoford [Fri, 1 Feb 2013 17:56:19 +0000 (09:56 -0800)]
Fix curves refresh bug
Change-Id: I5c85dcfa118345d24a5fef120541741e7d1cbdd6
Baligh Uddin [Fri, 1 Feb 2013 16:59:15 +0000 (08:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2ba59e627292005e1c7f6d592efd42f12886292f
Auto-generated-cl: translation import
Baligh Uddin [Fri, 1 Feb 2013 16:58:55 +0000 (08:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibc8434acc5356c40eddc6acd96a519efb806f6b9
Auto-generated-cl: translation import
Baligh Uddin [Fri, 1 Feb 2013 16:58:30 +0000 (08:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7ab5d3d4fc42800212aeb219d8dc4dfc248267f4
Auto-generated-cl: translation import
Baligh Uddin [Fri, 1 Feb 2013 16:57:48 +0000 (08:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9b7a8af6d2e6e0fe2f08119081881905a7e81c33
Auto-generated-cl: translation import
Angus Kong [Fri, 1 Feb 2013 02:22:44 +0000 (18:22 -0800)]
Make video snapshot save images in the background.
bug:
8114662
Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
John Reck [Fri, 1 Feb 2013 01:33:51 +0000 (17:33 -0800)]
am
346a15d3: Merge "Animate between photo modules" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Reck (1)
* commit '
346a15d3c7452927b3088a2c70410b90dfc36180':
Animate between photo modules
John Reck [Fri, 1 Feb 2013 01:32:42 +0000 (01:32 +0000)]
Merge "Animate between photo modules" into gb-ub-photos-bryce
John Reck [Wed, 7 Nov 2012 21:38:35 +0000 (13:38 -0800)]
Animate between photo modules
Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
Angus Kong [Thu, 31 Jan 2013 23:09:26 +0000 (15:09 -0800)]
am
066f0517: Merge "Make background media saving a service" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Angus Kong (1)
* commit '
066f05178e8c4d8ce67b4b457b6f00ebeac9fcbe':
Make background media saving a service
Angus Kong [Thu, 31 Jan 2013 22:36:34 +0000 (22:36 +0000)]
Merge "Make background media saving a service" into gb-ub-photos-bryce
Angus Kong [Wed, 30 Jan 2013 01:43:48 +0000 (17:43 -0800)]
Make background media saving a service
bug:
8091328
Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48
John Hoford [Thu, 31 Jan 2013 03:30:25 +0000 (19:30 -0800)]
am
915d60a3: add color selection ui to draw
# Via John Hoford
* commit '
915d60a378b0ca7bbe3af6312ccd2f4b94eb2da1':
add color selection ui to draw
John Hoford [Fri, 25 Jan 2013 21:28:34 +0000 (13:28 -0800)]
add color selection ui to draw
Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
John Reck [Thu, 31 Jan 2013 01:02:14 +0000 (17:02 -0800)]
am
5540a0d1: Merge "show enable sync option for canvas" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and John Reck (1)
* commit '
5540a0d130aa295d11e908719923faec3bce4029':
show enable sync option for canvas
John Reck [Thu, 31 Jan 2013 01:00:13 +0000 (01:00 +0000)]
Merge "show enable sync option for canvas" into gb-ub-photos-bryce
John Reck [Thu, 31 Jan 2013 00:37:48 +0000 (16:37 -0800)]
show enable sync option for canvas
Temporary change for testing
Change-Id: I46305cb3b182e0a48625bf4fcad3205334ade961
nicolasroard [Thu, 31 Jan 2013 00:01:44 +0000 (16:01 -0800)]
am
27f14ec6: Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
27f14ec6ff7565d96f6c838e7417a25c15beade3':
Clean up invalidate / redraw loop Move the recopy to the main thread
nicolasroard [Wed, 30 Jan 2013 23:54:29 +0000 (23:54 +0000)]
Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
nicolasroard [Tue, 29 Jan 2013 21:57:42 +0000 (13:57 -0800)]
Clean up invalidate / redraw loop
Move the recopy to the main thread
Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce
Michael Kolb [Tue, 29 Jan 2013 23:25:57 +0000 (15:25 -0800)]
am
0d0ec194: Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and Michael Kolb (1)
* commit '
0d0ec194f3a73267ad29fc7627b1f445bca77338':
Copy camera resources into Gallery2
Michael Kolb [Tue, 29 Jan 2013 23:24:34 +0000 (23:24 +0000)]
Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce
Michael Kolb [Tue, 29 Jan 2013 22:03:06 +0000 (14:03 -0800)]
Copy camera resources into Gallery2
Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
John Reck [Tue, 29 Jan 2013 22:55:31 +0000 (14:55 -0800)]
am
e606b862: Extract constants/boilerplate
# Via John Reck
* commit '
e606b862f26ba9e499db4f15940f8200841b9dc3':
Extract constants/boilerplate
John Reck [Tue, 29 Jan 2013 21:55:57 +0000 (13:55 -0800)]
Extract constants/boilerplate
Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97
nicolasroard [Tue, 29 Jan 2013 21:47:16 +0000 (13:47 -0800)]
am
4588a3cb: Merge "Fix thumbnail generation" into gb-ub-photos-bryce
# Via Android (Google) Code Review (1) and nicolasroard (1)
* commit '
4588a3cb75457f98b6b0fd1b7dc41e9db2079b16':
Fix thumbnail generation
nicolasroard [Tue, 29 Jan 2013 21:41:51 +0000 (21:41 +0000)]
Merge "Fix thumbnail generation" into gb-ub-photos-bryce
OSDN Git Service
