OSDN Git Service
Doris Liu [Sat, 23 Feb 2013 00:10:33 +0000 (00:10 +0000)]
am
0af269dc: am
e455b777: Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
* commit '
0af269dc91098dfd6c2577ba81392793aec43305':
Release surface texture to fix gray camera preview
Doris Liu [Sat, 23 Feb 2013 00:07:19 +0000 (16:07 -0800)]
am
e455b777: Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
* commit '
e455b777139921c5e72a9afca3f9ba3ae21975ba':
Release surface texture to fix gray camera preview
Doris Liu [Sat, 23 Feb 2013 00:04:21 +0000 (00:04 +0000)]
Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
John Reck [Fri, 22 Feb 2013 23:48:40 +0000 (23:48 +0000)]
John Reck [Fri, 22 Feb 2013 23:45:07 +0000 (15:45 -0800)]
am
5f30b98d: Start of photos
* commit '
5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820':
Start of photos
Doris Liu [Fri, 22 Feb 2013 22:31:17 +0000 (14:31 -0800)]
Release surface texture to fix gray camera preview
Bug:
8133672
Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80
Baligh Uddin [Fri, 22 Feb 2013 23:17:34 +0000 (23:17 +0000)]
am
d9efd139: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
d9efd139f94ce1c74c7ced361e2a15c412d5fbc9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Feb 2013 23:14:31 +0000 (23:14 +0000)]
Merge "Import translations. DO NOT MERGE"
John Reck [Fri, 15 Feb 2013 22:32:08 +0000 (14:32 -0800)]
Start of photos
Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
Baligh Uddin [Fri, 22 Feb 2013 22:31:15 +0000 (22:31 +0000)]
am
27303ce1: (-s ours) am
e7719898: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
27303ce16f50740fac1b8814fc11278aa67b2cbb':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Feb 2013 22:25:32 +0000 (14:25 -0800)]
am
e7719898: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
e77198985fc22ed2cf24f5d497309742165bc69f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Feb 2013 22:23:17 +0000 (22:23 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 22:02:39 +0000 (22:02 +0000)]
am
f132461d: am
d5633ea9: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce
* commit '
f132461df8cc54afe33272381af1e2fbefe30223':
Stopgap fixes for more of the photo editor's memory issues.
Ruben Brunk [Fri, 22 Feb 2013 22:00:21 +0000 (14:00 -0800)]
am
d5633ea9: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce
* commit '
d5633ea950ab82be13189705004ce97bce6a5715':
Stopgap fixes for more of the photo editor's memory issues.
Ruben Brunk [Fri, 22 Feb 2013 21:58:33 +0000 (21:58 +0000)]
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:54:59 +0000 (21:54 +0000)]
am
3c7fdae3: am
ddec680a: Merge "Revert "Stopgap fixes for more of the photo editor\'s memory issues."" into gb-ub-photos-bryce
* commit '
3c7fdae3dea349b4111e18dee29f21da5e9b0c66':
Revert "Stopgap fixes for more of the photo editor's memory issues."
Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]
Stopgap fixes for more of the photo editor's memory issues.
Bug:
8253109
Bug:
8233895
Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b
Ruben Brunk [Fri, 22 Feb 2013 21:49:12 +0000 (13:49 -0800)]
am
ddec680a: Merge "Revert "Stopgap fixes for more of the photo editor\'s memory issues."" into gb-ub-photos-bryce
* commit '
ddec680a6d4604bc6fd44b29dfbf964422f40fcb':
Revert "Stopgap fixes for more of the photo editor's memory issues."
Ruben Brunk [Fri, 22 Feb 2013 21:47:43 +0000 (21:47 +0000)]
am
4b55dbe5: am
fc673e13: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce
* commit '
4b55dbe54fb589aa82693b8e28b870d43d29a8e7':
Stopgap fixes for more of the photo editor's memory issues.
Ruben Brunk [Fri, 22 Feb 2013 21:47:06 +0000 (21:47 +0000)]
Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:45:26 +0000 (21:45 +0000)]
Revert "Stopgap fixes for more of the photo editor's memory issues."
This reverts commit
4c91156f9a2e48ebaec86e3a46ea9b7855392cfd
Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed
Ruben Brunk [Fri, 22 Feb 2013 21:44:01 +0000 (13:44 -0800)]
am
fc673e13: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce
* commit '
fc673e131aa3482e5202fad1b54208442df35c2c':
Stopgap fixes for more of the photo editor's memory issues.
Ruben Brunk [Fri, 22 Feb 2013 21:41:03 +0000 (21:41 +0000)]
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 21:25:51 +0000 (13:25 -0800)]
Stopgap fixes for more of the photo editor's memory issues.
Bug:
8253109
Bug:
8233895
Change-Id: I676b6749f3b273a431323609add01e82b88db456
Bobby Georgescu [Fri, 22 Feb 2013 21:09:58 +0000 (21:09 +0000)]
am
2d5cc3c1: am
fae7bf85: Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
* commit '
2d5cc3c1ff8533d4452446e899f4923eb957a46d':
Replace various BitmapPools with a smarter unified pool
Bobby Georgescu [Fri, 22 Feb 2013 21:05:41 +0000 (13:05 -0800)]
am
fae7bf85: Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
* commit '
fae7bf8557f7de818a768d7a8c30425a9a5641d8':
Replace various BitmapPools with a smarter unified pool
Bobby Georgescu [Fri, 22 Feb 2013 21:03:45 +0000 (21:03 +0000)]
Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
Bobby Georgescu [Tue, 19 Feb 2013 23:49:14 +0000 (15:49 -0800)]
Replace various BitmapPools with a smarter unified pool
Make all of gallery use a single shared pool, and pave the
way for making the pool more adaptive based on the current
workload.
Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac
nicolasroard [Fri, 22 Feb 2013 19:46:39 +0000 (19:46 +0000)]
am
102b2e0a: am
ea332c69: Don\'t apply the filters twice in partial rendering...
* commit '
102b2e0aaf5354101ffd17d91d707f8fbda61238':
Don't apply the filters twice in partial rendering...
nicolasroard [Fri, 22 Feb 2013 19:43:14 +0000 (11:43 -0800)]
am
ea332c69: Don\'t apply the filters twice in partial rendering...
* commit '
ea332c69f084322ebdd13419424ee5fab2351760':
Don't apply the filters twice in partial rendering...
nicolasroard [Fri, 22 Feb 2013 19:35:41 +0000 (11:35 -0800)]
Don't apply the filters twice in partial rendering...
Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28
Ruben Brunk [Fri, 22 Feb 2013 17:57:12 +0000 (17:57 +0000)]
am
9f43cff6: am
2c87aafc: Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
* commit '
9f43cff67793dbd84c1f3ee124accf7653b323b4':
Move setting wallpaper to a background thread.
Ruben Brunk [Fri, 22 Feb 2013 17:54:35 +0000 (09:54 -0800)]
am
2c87aafc: Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
* commit '
2c87aafc0e4c5f67fe41c0cac301eabb6d5c716e':
Move setting wallpaper to a background thread.
Ruben Brunk [Fri, 22 Feb 2013 17:52:59 +0000 (17:52 +0000)]
Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
Ruben Brunk [Fri, 22 Feb 2013 04:13:20 +0000 (20:13 -0800)]
Move setting wallpaper to a background thread.
Bug:
8088767
Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3
Baligh Uddin [Fri, 22 Feb 2013 16:16:53 +0000 (08:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I25144d117077ba76dff4a24a255dbc3513533fa3
Auto-generated-cl: translation import
Baligh Uddin [Fri, 22 Feb 2013 16:15:57 +0000 (08:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iab4b1ffed69207e4d4e3962d15845d4d550e7022
Auto-generated-cl: translation import
nicolasroard [Fri, 22 Feb 2013 05:54:14 +0000 (05:54 +0000)]
am
728544cf: am
e5498da0: Pinch to zoom refine
* commit '
728544cfd335384bcf3698fd5bd0be1992d9cbfd':
Pinch to zoom refine
Ruben Brunk [Fri, 22 Feb 2013 05:53:59 +0000 (05:53 +0000)]
am
5de2f5f4: am
0f8047fe: Fix for null check with RS allocations.
* commit '
5de2f5f42d4b787388ca9af8d2476636953b05ab':
Fix for null check with RS allocations.
John Hoford [Fri, 22 Feb 2013 05:53:52 +0000 (05:53 +0000)]
am
2a708786: am
2fc7efdc: fix draw and ellipse to handle pinch to zoom
* commit '
2a7087869e58cd2c1598a19e98095e3a467ce8bc':
fix draw and ellipse to handle pinch to zoom
Michael Kolb [Fri, 22 Feb 2013 05:53:10 +0000 (05:53 +0000)]
am
299e47ef: am
8539fc1a: Adjust capture animation timing
* commit '
299e47eff624708a4e6366935b5900c60d212e50':
Adjust capture animation timing
Ruben Brunk [Fri, 22 Feb 2013 05:52:59 +0000 (05:52 +0000)]
am
4749d8a8: am
e406ec4d: Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce
* commit '
4749d8a81927fae0b36dfdfed8d5cca138053563':
Temporary handling when running out of heap in filtershow.
John Hoford [Fri, 22 Feb 2013 05:52:59 +0000 (05:52 +0000)]
am
70c13f97: am
8921c28c: add highlight filter
* commit '
70c13f97af6e675884930178f0d06faedda44f2d':
add highlight filter
nicolasroard [Fri, 22 Feb 2013 05:52:58 +0000 (05:52 +0000)]
am
853b9ec3: am
91b80b25: Remove SliderController class
* commit '
853b9ec3e780984f320de864d64005cee5b73a1a':
Remove SliderController class
Jason Noguchi [Fri, 22 Feb 2013 05:52:58 +0000 (05:52 +0000)]
am
33afd05e: am
48f739a3: Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently
* commit '
33afd05e3815c28df82944ad1787918bcab1e8c9':
Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite.
nicolasroard [Fri, 22 Feb 2013 05:52:57 +0000 (05:52 +0000)]
am
f84e8b9b: am
431aa19d: Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce
* commit '
f84e8b9b3f40148df6592542435c30c3dc15040c':
Remove slider in ImageShow, cleanup code
Doris Liu [Fri, 22 Feb 2013 05:52:57 +0000 (05:52 +0000)]
am
2cae524b: am
8850b8e7: Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
* commit '
2cae524b83b8eecd14eb71bb0b74e12e5edbccfe':
Fix NPE for when camera is disabled
nicolasroard [Fri, 22 Feb 2013 05:52:56 +0000 (05:52 +0000)]
nicolasroard [Fri, 22 Feb 2013 05:52:52 +0000 (05:52 +0000)]
am
d27afb8d: am
df0b0c4e: Add pinch to zoom
* commit '
d27afb8d8db986c49bdfff6b459823c8ae3ebfda':
Add pinch to zoom
nicolasroard [Fri, 22 Feb 2013 01:48:52 +0000 (17:48 -0800)]
am
e5498da0: Pinch to zoom refine
* commit '
e5498da0262fc836738aad63ea30286d8afa643c':
Pinch to zoom refine
nicolasroard [Thu, 21 Feb 2013 23:52:49 +0000 (15:52 -0800)]
Pinch to zoom refine
Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
Ruben Brunk [Thu, 21 Feb 2013 23:53:07 +0000 (15:53 -0800)]
am
0f8047fe: Fix for null check with RS allocations.
* commit '
0f8047fe826a84829ab37bc7cd24c8a4dea0db64':
Fix for null check with RS allocations.
Ruben Brunk [Thu, 21 Feb 2013 23:43:33 +0000 (15:43 -0800)]
Fix for null check with RS allocations.
Bug:
8243554
Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7
John Hoford [Thu, 21 Feb 2013 23:30:53 +0000 (15:30 -0800)]
am
2fc7efdc: fix draw and ellipse to handle pinch to zoom
* commit '
2fc7efdcd75279649091471dda3ee600db25a995':
fix draw and ellipse to handle pinch to zoom
John Hoford [Thu, 21 Feb 2013 23:18:37 +0000 (15:18 -0800)]
fix draw and ellipse to handle pinch to zoom
Change-Id: I8af9b37dcd98425959742a4142756963363d1cec
Michael Kolb [Thu, 21 Feb 2013 23:11:31 +0000 (15:11 -0800)]
am
8539fc1a: Adjust capture animation timing
* commit '
8539fc1a5406af9edd5414fba3615cc045aa63ec':
Adjust capture animation timing
Michael Kolb [Thu, 21 Feb 2013 19:37:45 +0000 (11:37 -0800)]
Adjust capture animation timing
Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb
Ruben Brunk [Thu, 21 Feb 2013 22:17:50 +0000 (14:17 -0800)]
am
e406ec4d: Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce
* commit '
e406ec4ddcfe6336c4119de9044b27f38197fff7':
Temporary handling when running out of heap in filtershow.
John Hoford [Thu, 21 Feb 2013 22:17:49 +0000 (14:17 -0800)]
am
8921c28c: add highlight filter
* commit '
8921c28c7333ad2b4d34f013904ad4737044f366':
add highlight filter
nicolasroard [Thu, 21 Feb 2013 22:17:48 +0000 (14:17 -0800)]
am
91b80b25: Remove SliderController class
* commit '
91b80b2560e663b15ee75ab1bca775028c7868c0':
Remove SliderController class
Jason Noguchi [Thu, 21 Feb 2013 22:17:48 +0000 (14:17 -0800)]
am
48f739a3: Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block o
* commit '
48f739a395194ffcd589751c8689a75721b2ce97':
Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite.
nicolasroard [Thu, 21 Feb 2013 22:17:47 +0000 (14:17 -0800)]
am
431aa19d: Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce
* commit '
431aa19d3ab2e9d7d87ef6ee67984a4c649841c0':
Remove slider in ImageShow, cleanup code
Doris Liu [Thu, 21 Feb 2013 22:17:46 +0000 (14:17 -0800)]
am
8850b8e7: Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
* commit '
8850b8e776d984a3924e9849629f096c57920a7a':
Fix NPE for when camera is disabled
nicolasroard [Thu, 21 Feb 2013 22:17:45 +0000 (14:17 -0800)]
Ruben Brunk [Thu, 21 Feb 2013 21:27:14 +0000 (21:27 +0000)]
am
d633306b: am
88158f57: Removed unsupported GL operations.
* commit '
d633306b1bbc8e97033e26960d633b5168be470d':
Removed unsupported GL operations.
Ruben Brunk [Thu, 21 Feb 2013 21:12:21 +0000 (21:12 +0000)]
Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce
Ruben Brunk [Thu, 21 Feb 2013 06:45:55 +0000 (22:45 -0800)]
Temporary handling when running out of heap in filtershow.
Bug:
8233895
Change-Id: Id078d2a4b387127c0d230bc5d9de4590f0e9f72b
John Hoford [Thu, 21 Feb 2013 01:50:42 +0000 (17:50 -0800)]
add highlight filter
Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
nicolasroard [Thu, 21 Feb 2013 17:52:14 +0000 (09:52 -0800)]
Remove SliderController class
Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331
Jason Noguchi [Thu, 21 Feb 2013 04:33:47 +0000 (04:33 +0000)]
Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite." into gb-ub-photos-bryce
nicolasroard [Thu, 21 Feb 2013 04:07:27 +0000 (04:07 +0000)]
Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce
Doris Liu [Thu, 21 Feb 2013 03:36:46 +0000 (03:36 +0000)]
Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
nicolasroard [Thu, 21 Feb 2013 03:32:37 +0000 (19:32 -0800)]
Remove slider in ImageShow, cleanup code
Change-Id: I005d4ecd33a5b6fcd23af6a6ba46419e7c9fc683
nicolasroard [Thu, 21 Feb 2013 01:44:51 +0000 (17:44 -0800)]
Fix typo
Change-Id: I6c41782a033d5ad1bb5780b22d99658223b23a0b
nicolasroard [Thu, 21 Feb 2013 01:08:05 +0000 (17:08 -0800)]
am
df0b0c4e: Add pinch to zoom
* commit '
df0b0c4eaafcc9e4652fe6ec0791e4abe1c3b750':
Add pinch to zoom
nicolasroard [Fri, 15 Feb 2013 00:33:01 +0000 (16:33 -0800)]
Add pinch to zoom
Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a
Doris Liu [Thu, 21 Feb 2013 00:29:44 +0000 (16:29 -0800)]
Fix NPE for when camera is disabled
Bug:
7950211
Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639
Jason Noguchi [Wed, 20 Feb 2013 22:42:27 +0000 (14:42 -0800)]
Scaling down the stress test defaults iteration counts to some base level.
For true stress testing, need to pass arguments to scale these back up to 100.
Also, temporarily removing SwitchPreview test which needs updating and currently
would block other tests in stress suite.
Change-Id: I9dd92e0090e2554aca5cb4b23fed2d33554c9c5e
Ruben Brunk [Wed, 20 Feb 2013 23:36:19 +0000 (15:36 -0800)]
am
88158f57: Removed unsupported GL operations.
* commit '
88158f577a2d80a7a3ab5ad92452b6e32b059271':
Removed unsupported GL operations.
Ruben Brunk [Wed, 20 Feb 2013 22:44:02 +0000 (14:44 -0800)]
Removed unsupported GL operations.
Bug:
8223749
Change-Id: I722220def36aa4a9e53666540471100df6609d74
Ed Heyl [Wed, 20 Feb 2013 21:57:22 +0000 (21:57 +0000)]
am
264247a7: Merge remote-tracking branch \'goog/jb-mr2-release\'
* commit '
264247a73a61664d9b76c9eb11f305d264d8e0e2':
Add null check on the source URI
Fix memory leak in ComboPreferences
Ed Heyl [Wed, 20 Feb 2013 21:47:32 +0000 (13:47 -0800)]
Merge remote-tracking branch 'goog/jb-mr2-release'
Victor Doba [Wed, 20 Feb 2013 17:33:25 +0000 (17:33 +0000)]
am
1e3693c0: am
c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
* commit '
1e3693c03d9a08392bbf4a907055ee2baa89f097':
Show the Utility Panel by default.
Victor Doba [Wed, 20 Feb 2013 17:31:38 +0000 (09:31 -0800)]
am
c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
* commit '
c8e006639baf1512715e0d7f2c02f88204ab55c0':
Show the Utility Panel by default.
Victor Doba [Wed, 20 Feb 2013 17:29:53 +0000 (17:29 +0000)]
Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
John Hoford [Wed, 20 Feb 2013 16:48:32 +0000 (16:48 +0000)]
am
789cffa1: am
1863a311: fix vignette startup issues
* commit '
789cffa174bb5f73ee932bedae9b19ba1a20bf92':
fix vignette startup issues
John Hoford [Wed, 20 Feb 2013 16:45:14 +0000 (08:45 -0800)]
am
1863a311: fix vignette startup issues
* commit '
1863a3119a802517b1c2a53763f904f73fdc940b':
fix vignette startup issues
John Hoford [Wed, 20 Feb 2013 16:31:40 +0000 (08:31 -0800)]
fix vignette startup issues
Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
The Android Automerger [Wed, 20 Feb 2013 13:56:07 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to master
John Hoford [Tue, 19 Feb 2013 23:41:03 +0000 (23:41 +0000)]
am
50046bd3: am
a93d5ee9: add movable vignette
* commit '
50046bd326f943460c05399ca55886922ad818eb':
add movable vignette
John Hoford [Tue, 19 Feb 2013 23:35:59 +0000 (15:35 -0800)]
am
a93d5ee9: add movable vignette
* commit '
a93d5ee9c409e2328dcbe2326591436f8ac23146':
add movable vignette
John Hoford [Sat, 16 Feb 2013 17:20:59 +0000 (09:20 -0800)]
add movable vignette
Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
Baligh Uddin [Tue, 19 Feb 2013 19:27:16 +0000 (19:27 +0000)]
am
3c198e8b: (-s ours) am
03010e45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
3c198e8bce7f168a128d1359e8f454cc6cc8ab9b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:27:15 +0000 (19:27 +0000)]
am
8e86278b: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
8e86278b9c27a6236464c936b084ffc907892199':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:23:46 +0000 (19:23 +0000)]
am
7ebc6f3f: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
7ebc6f3fa1e0be98a60268fe2ffdc060e21e0195':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:23:32 +0000 (11:23 -0800)]
am
03010e45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
03010e45387b8f1a715fd7f5cfac0793008fdc9b':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Feb 2013 19:23:18 +0000 (19:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 19 Feb 2013 19:22:16 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Tue, 19 Feb 2013 19:21:08 +0000 (19:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 19 Feb 2013 19:17:04 +0000 (19:17 +0000)]
am
346f5bb0: (-s ours) am
fc18a75c: (-s ours) Import translations. DO NOT MERGE
* commit '
346f5bb06b8a73dae28b123e61164bf45d71c092':
Import translations. DO NOT MERGE