OSDN Git Service
Michael Kolb [Thu, 14 Mar 2013 22:11:30 +0000 (15:11 -0700)]
am
0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce
* commit '
0198d64d86ad05e72c2459ae1055f482d30b5305':
Fix exposure compensation
Michael Kolb [Thu, 14 Mar 2013 22:09:15 +0000 (22:09 +0000)]
Merge "Fix exposure compensation" into gb-ub-photos-bryce
Michael Kolb [Thu, 14 Mar 2013 22:06:51 +0000 (15:06 -0700)]
Fix exposure compensation
Bug:
8391082
Change-Id: I346b57dd0c1ed240ab4daa61147c2dd8f8892b44
Justin Koh [Thu, 14 Mar 2013 21:54:20 +0000 (14:54 -0700)]
am
4a204853: Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce
* commit '
4a204853b57a6e855b0f4c2179d41bebce591ea7':
Update Gallery Pano Provider.
Justin Koh [Thu, 14 Mar 2013 21:52:48 +0000 (21:52 +0000)]
Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce
Justin Koh [Thu, 14 Mar 2013 21:28:29 +0000 (14:28 -0700)]
Update Gallery Pano Provider.
Update Gallery Pano Provider. Use DIP instead of PX.
Change-Id: I8871502aa215012a8647401f7ee1e7906e110fe4
Tim Murray [Thu, 14 Mar 2013 21:22:01 +0000 (14:22 -0700)]
am
fdb2fbc7: Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce
* commit '
fdb2fbc75750869dacb5e61779e00d93b25aed8e':
Change element type to A_8 to support sampling.
Tim Murray [Thu, 14 Mar 2013 21:19:52 +0000 (21:19 +0000)]
Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce
Ruben Brunk [Thu, 14 Mar 2013 21:07:48 +0000 (14:07 -0700)]
am
6cdae525: Merge "Fix image icons on Razr M." into gb-ub-photos-bryce
* commit '
6cdae525a4c602860b464823685b7b6ac0298abc':
Fix image icons on Razr M.
Ruben Brunk [Thu, 14 Mar 2013 21:06:08 +0000 (21:06 +0000)]
Merge "Fix image icons on Razr M." into gb-ub-photos-bryce
Ruben Brunk [Thu, 14 Mar 2013 20:47:51 +0000 (13:47 -0700)]
Fix image icons on Razr M.
Change-Id: I9f47dd043055fb5dc25dda643a3e9c81356bd0d5
Tim Murray [Thu, 14 Mar 2013 20:56:39 +0000 (13:56 -0700)]
Change element type to A_8 to support sampling.
Change-Id: Ib91c924c9c2966bf431e24519af8ade7e360cf88
Mangesh Ghiware [Thu, 14 Mar 2013 19:34:11 +0000 (12:34 -0700)]
am
693a5b7a: Use plurals for table names for consistency.
* commit '
693a5b7a18066d4757d49a44214356a3dd9f61a0':
Use plurals for table names for consistency.
Mangesh Ghiware [Thu, 14 Mar 2013 17:27:04 +0000 (10:27 -0700)]
Use plurals for table names for consistency.
Change-Id: I663c0085ed467f3f61f6060147374d9128967e2d
nicolasroard [Thu, 14 Mar 2013 16:16:48 +0000 (09:16 -0700)]
am
978f4aae: Fix for crash upon saving image
* commit '
978f4aae1d2923fd125f85a6d5c568a26c571522':
Fix for crash upon saving image
nicolasroard [Thu, 14 Mar 2013 15:58:24 +0000 (08:58 -0700)]
Fix for crash upon saving image
Change-Id: I305626a61a07d2290e7d5600da4c26f2a82ab1c9
Baligh Uddin [Thu, 14 Mar 2013 04:50:39 +0000 (21:50 -0700)]
am
0dc23631: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
0dc236310352422e27ce5f045d4fc4d27163b08e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 14 Mar 2013 04:48:40 +0000 (04:48 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 14 Mar 2013 04:48:22 +0000 (04:48 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Nicolas Roard [Thu, 14 Mar 2013 03:32:03 +0000 (20:32 -0700)]
am
bbf96f27: Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce
* commit '
bbf96f2785c3f3f91d497b18f8b2dd9c0cb2b9b6':
Fix photo editor RS allocation on orientation change.
Nicolas Roard [Thu, 14 Mar 2013 03:30:34 +0000 (03:30 +0000)]
Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce
John Hoford [Thu, 14 Mar 2013 03:24:55 +0000 (20:24 -0700)]
am
c6a12b24: Merge "add icon to indicate menu" into gb-ub-photos-bryce
* commit '
c6a12b24b4662ba9fa7cc8c7d072ecb0a8f79e46':
add icon to indicate menu
John Hoford [Thu, 14 Mar 2013 03:23:28 +0000 (03:23 +0000)]
Merge "add icon to indicate menu" into gb-ub-photos-bryce
John Hoford [Thu, 14 Mar 2013 03:17:43 +0000 (20:17 -0700)]
add icon to indicate menu
Change-Id: I3327751cd78dd9b654e51e99a6756967c6fb82f5
Ruben Brunk [Thu, 14 Mar 2013 02:41:04 +0000 (19:41 -0700)]
Fix photo editor RS allocation on orientation change.
Bug:
8383050
Change-Id: Ic549d1f3fae22238dda08260cd7410c6054ce7b1
Doris Liu [Thu, 14 Mar 2013 02:08:15 +0000 (19:08 -0700)]
am
5bedc41e: Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce
* commit '
5bedc41eb4bf30fe277de3977db8331f970c8f0b':
Use Model-View-Controller pattern on video module
Doris Liu [Thu, 14 Mar 2013 02:06:16 +0000 (02:06 +0000)]
Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce
Ruben Brunk [Thu, 14 Mar 2013 01:07:47 +0000 (18:07 -0700)]
am
6e6a5243: Exif parser modifications.
* commit '
6e6a524390d8ddebce5de0dcc8ae258e652ec80a':
Exif parser modifications.
Ruben Brunk [Tue, 12 Mar 2013 02:00:12 +0000 (19:00 -0700)]
Exif parser modifications.
Bug:
8018327
Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
Doris Liu [Wed, 13 Mar 2013 02:24:28 +0000 (19:24 -0700)]
Use Model-View-Controller pattern on video module
Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa
Bobby Georgescu [Wed, 13 Mar 2013 22:13:56 +0000 (15:13 -0700)]
am
8cc88f03: Merge "size tweak" into gb-ub-photos-bryce
* commit '
8cc88f0320a4b62f8256fb33faebf0f75cf172e0':
size tweak
Bobby Georgescu [Wed, 13 Mar 2013 22:12:24 +0000 (22:12 +0000)]
Merge "size tweak" into gb-ub-photos-bryce
John Reck [Wed, 13 Mar 2013 22:11:14 +0000 (15:11 -0700)]
size tweak
Change-Id: I2153774ef05f67b313f86c4552ccd0471fae1f6e
Angus Kong [Wed, 13 Mar 2013 22:01:46 +0000 (15:01 -0700)]
am
215bb750: Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
* commit '
215bb750dcb21e449227acb3cdf76da3cb6173a2':
Horizontal scrollable filmstrip view.
Angus Kong [Wed, 13 Mar 2013 21:39:32 +0000 (21:39 +0000)]
Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
Bobby Georgescu [Wed, 13 Mar 2013 21:31:30 +0000 (14:31 -0700)]
am
f069751e: Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce
* commit '
f069751e1adcb85ce14934b7a275f1276f5490a8':
Sharing support for albums, bulk operations infrastructure
Bobby Georgescu [Wed, 13 Mar 2013 21:30:18 +0000 (21:30 +0000)]
Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce
Angus Kong [Fri, 22 Feb 2013 22:02:25 +0000 (14:02 -0800)]
Horizontal scrollable filmstrip view.
Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
Bobby Georgescu [Wed, 13 Mar 2013 21:23:21 +0000 (14:23 -0700)]
am
730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
* commit '
730685b2b4c286d32d97f92283d12254df284f0c':
Add coarse grained events for camera mode, filmstrip stats
Bobby Georgescu [Wed, 13 Mar 2013 21:21:32 +0000 (21:21 +0000)]
Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
Bobby Georgescu [Sat, 9 Mar 2013 04:15:15 +0000 (20:15 -0800)]
Sharing support for albums, bulk operations infrastructure
Change-Id: I590f60ab85ffbd9cf9d7cd9982627604fa1b427f
Michael Kolb [Wed, 13 Mar 2013 21:04:59 +0000 (14:04 -0700)]
am
d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
* commit '
d52594cf7993e156491a806ade65b6f85e639b20':
Fix bug in exposure setting
Michael Kolb [Wed, 13 Mar 2013 21:00:41 +0000 (21:00 +0000)]
Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
Ruben Brunk [Wed, 13 Mar 2013 21:01:49 +0000 (14:01 -0700)]
am
4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce
* commit '
4563676bbf9d32a3dce180123bca7adc6940809e':
Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
Ruben Brunk [Wed, 13 Mar 2013 20:59:48 +0000 (20:59 +0000)]
Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce
Michael Kolb [Wed, 13 Mar 2013 20:41:01 +0000 (13:41 -0700)]
Fix bug in exposure setting
Bug:
8314498
Limit exposure compensation to -3 to 3;
some devices offer -4 to 4, and we don't have icons
covering that range
Change-Id: I2b334733c7630d57682b905d41dfe2ceb5641133
Ruben Brunk [Wed, 13 Mar 2013 07:47:03 +0000 (00:47 -0700)]
Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
Bug:
8373600
Bug:
8363001
Bug:
8344345
Bug:
8264659
This CL fixes several things:
- FilteringPipeline no longer leaks a handler thread every time photoeditor is reopened.
- ImageFilterRS no longer leaks an RS context and thread every time photoeditor is reopened.
- ImageFilterRS now uses locking.
- ImageFilterRS no longer leaks Bitmap references or static renderscript allocations.
Change-Id: I79ebde1a8ba8ad689791c2af8db0c3c907e06399
Michael Kolb [Wed, 13 Mar 2013 17:52:51 +0000 (10:52 -0700)]
am
d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce
* commit '
d15e43fb5295ae0cf6af45663043d603e2e181ba':
Fix Monkey NPE
Michael Kolb [Wed, 13 Mar 2013 17:50:24 +0000 (17:50 +0000)]
Merge "Fix Monkey NPE" into gb-ub-photos-bryce
Michael Kolb [Wed, 13 Mar 2013 17:47:06 +0000 (10:47 -0700)]
Fix Monkey NPE
Bug:
8377895
Change-Id: Iaa89330e8c69961d700e0aab91d7855d579874f0
Bobby Georgescu [Wed, 13 Mar 2013 16:45:18 +0000 (09:45 -0700)]
Add coarse grained events for camera mode, filmstrip stats
Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
Bobby Georgescu [Wed, 13 Mar 2013 16:23:06 +0000 (09:23 -0700)]
am
f37648b8: Usage statistics collection for camera module, filmstrip
* commit '
f37648b877bf6029d7afead31e965b473114c89c':
Usage statistics collection for camera module, filmstrip
Bobby Georgescu [Wed, 13 Mar 2013 05:45:17 +0000 (22:45 -0700)]
Usage statistics collection for camera module, filmstrip
Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
nicolasroard [Wed, 13 Mar 2013 01:39:44 +0000 (18:39 -0700)]
am
e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce
* commit '
e5e61f884c59d5ba15aae6b228c4bcaad58e0642':
Fix preview synchronization
nicolasroard [Wed, 13 Mar 2013 01:38:27 +0000 (01:38 +0000)]
Merge "Fix preview synchronization" into gb-ub-photos-bryce
nicolasroard [Wed, 13 Mar 2013 01:23:41 +0000 (18:23 -0700)]
Fix preview synchronization
Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04
John Reck [Wed, 13 Mar 2013 00:24:21 +0000 (17:24 -0700)]
John Reck [Wed, 13 Mar 2013 00:22:48 +0000 (17:22 -0700)]
fix build
Change-Id: I41898041ad2e6d59973af30680288c436f3c6357
John Reck [Wed, 13 Mar 2013 00:02:10 +0000 (17:02 -0700)]
am
2f205d54: basic activated support
* commit '
2f205d54c88ea3f6b1a1a0630201fdb10b0689e2':
basic activated support
John Reck [Wed, 13 Mar 2013 00:02:09 +0000 (17:02 -0700)]
John Reck [Tue, 12 Mar 2013 23:11:18 +0000 (16:11 -0700)]
basic activated support
Change-Id: If1c1faf42311ddbc76b617bff5f3c6bdafdef5d1
John Reck [Tue, 12 Mar 2013 20:46:33 +0000 (13:46 -0700)]
Use viewpager
Change-Id: Icd320799ce1e13815e34b2a0e45a9f6a47736de3
nicolasroard [Tue, 12 Mar 2013 22:50:19 +0000 (15:50 -0700)]
am
9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce
* commit '
9eaa85a0384f1c39c16dedb486aaab2b32911d04':
Add loading resources helper functions to ImageFilterRS
nicolasroard [Tue, 12 Mar 2013 22:48:50 +0000 (22:48 +0000)]
Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce
nicolasroard [Tue, 12 Mar 2013 21:30:33 +0000 (14:30 -0700)]
Add loading resources helper functions to ImageFilterRS
Change-Id: I79b4996b5da0fa05536f2f53f770d01e9735b96c
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: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: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
Baligh Uddin [Tue, 12 Mar 2013 18:51:07 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I138f7ae46beb3cdfec1ba5bb6f4e812bb4f683ae
Auto-generated-cl: translation import
Baligh Uddin [Tue, 12 Mar 2013 18:50:46 +0000 (11:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9ba7e5ba20791e379d32305688aa7a7d6e2bce98
Auto-generated-cl: translation import
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
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: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 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:46:15 +0000 (08:46 -0700)]
Fix potential problem with default rsc number
Change-Id: I8205dbb2488232084f984a10963bb9286ff19e0e
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
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: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: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: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: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: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: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':