git.osdn.net Git - android-x86/packages-apps-Gallery2.git/log

John Hoford [Tue, 9 Apr 2013 21:31:39 +0000 (14:31 -0700)]

am ba635f61: am 1d44a7ef: am 34d607c8: am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce

* commit 'ba635f617a405ac8e20c9e98c53019e03b86d18d':
ui cleanup

commit | commitdiff | tree

Bobby Georgescu [Tue, 9 Apr 2013 21:31:39 +0000 (14:31 -0700)]

am 65d94c03: am 8e9faa89: am 16eafe60: am f79a935f: Remove unneeded READ_SMS permission

* commit '65d94c036347ea9aba03674680179e1f09c41d0c':
Remove unneeded READ_SMS permission

commit | commitdiff | tree

Doris Liu [Tue, 9 Apr 2013 21:31:38 +0000 (14:31 -0700)]

am e1725525: am 9a58b957: am a5d3f7e3: am fb063617: Work in progress - Put preview in TextureView

* commit 'e1725525ca3820419fae426e8c0dfe1e76f20527':
Work in progress - Put preview in TextureView

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 21:25:51 +0000 (14:25 -0700)]

am 1d44a7ef: am 34d607c8: am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce

* commit '1d44a7efa6f6a683bbf5511413b2ea5cd12ddae4':
ui cleanup

commit | commitdiff | tree

Bobby Georgescu [Tue, 9 Apr 2013 21:25:50 +0000 (14:25 -0700)]

am 8e9faa89: am 16eafe60: am f79a935f: Remove unneeded READ_SMS permission

* commit '8e9faa89c8bf9e4875b9015293f5a5d534602475':
Remove unneeded READ_SMS permission

commit | commitdiff | tree

Doris Liu [Tue, 9 Apr 2013 21:25:14 +0000 (14:25 -0700)]

am 9a58b957: am a5d3f7e3: am fb063617: Work in progress - Put preview in TextureView

* commit '9a58b957489b76800145b77c8c59290ef6a12cc2':
Work in progress - Put preview in TextureView

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 20:08:44 +0000 (13:08 -0700)]

am 34d607c8: am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce

* commit '34d607c88f26252325058eaa76dfead319bb6eb6':
ui cleanup

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 20:05:48 +0000 (13:05 -0700)]

am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce

* commit 'ddcb0880c9748ce9a77f1472864977c767f46f0f':
ui cleanup

commit | commitdiff | tree

Bobby Georgescu [Tue, 9 Apr 2013 20:05:23 +0000 (13:05 -0700)]

am 16eafe60: am f79a935f: Remove unneeded READ_SMS permission

* commit '16eafe6016a70ae9d6e31461321ec5c7b5933aa6':
Remove unneeded READ_SMS permission

commit | commitdiff | tree

Bobby Georgescu [Tue, 9 Apr 2013 20:02:35 +0000 (13:02 -0700)]

am f79a935f: Remove unneeded READ_SMS permission

* commit 'f79a935f1ce85c55c8fba0b46dee362c653a8a78':
Remove unneeded READ_SMS permission

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 20:02:06 +0000 (20:02 +0000)]

Merge "ui cleanup" into gb-ub-photos-bryce

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 18:51:42 +0000 (11:51 -0700)]

ui cleanup

Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01

commit | commitdiff | tree

Bobby Georgescu [Mon, 8 Apr 2013 17:14:14 +0000 (10:14 -0700)]

Remove unneeded READ_SMS permission

Bug: 8469283
Change-Id: I0d211705fe1fb86dc0ce85230e82d500f0202291

commit | commitdiff | tree

Doris Liu [Tue, 9 Apr 2013 17:56:41 +0000 (10:56 -0700)]

am a5d3f7e3: am fb063617: Work in progress - Put preview in TextureView

* commit 'a5d3f7e3c7b75a6c8315770e39c5b241a7693ec2':
Work in progress - Put preview in TextureView

commit | commitdiff | tree

Doris Liu [Tue, 9 Apr 2013 17:54:03 +0000 (10:54 -0700)]

am fb063617: Work in progress - Put preview in TextureView

* commit 'fb0636179335a7786ec2c0edf9889a55596db126':
Work in progress - Put preview in TextureView

commit | commitdiff | tree

Doris Liu [Fri, 15 Mar 2013 04:01:35 +0000 (21:01 -0700)]

Work in progress - Put preview in TextureView

Fixed gesture recognizing and pie menu.
Fixed camera picker. Exposure setting got fixed with rebasing.
Rebased for new pie menu
Fixed camera mode switch listener

Ongoing: secure album, aspect ratio for video recording on ICS

Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 16:57:45 +0000 (09:57 -0700)]

am e1b1837f: am 001e2989: am 6177241b: am b1c75f60: Fix panel color background in landscape

* commit 'e1b1837f765cb9dfe6d4d98eb06fa89044d0a69a':
Fix panel color background in landscape

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 16:54:51 +0000 (09:54 -0700)]

am 001e2989: am 6177241b: am b1c75f60: Fix panel color background in landscape

* commit '001e29896a085ebfbc84c1ca56862a1f0e693831':
Fix panel color background in landscape

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 16:51:28 +0000 (09:51 -0700)]

am 6177241b: am b1c75f60: Fix panel color background in landscape

* commit '6177241b8b2fc91c627abbf88dca95a7cd35ff81':
Fix panel color background in landscape

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 16:49:34 +0000 (09:49 -0700)]

am b1c75f60: Fix panel color background in landscape

* commit 'b1c75f6028ecbf7bd05f945c542da0f848bc594b':
Fix panel color background in landscape

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 16:46:17 +0000 (09:46 -0700)]

Fix panel color background in landscape

Change-Id: Id1a0470c8df5fe39f5504a43e1602672ac0d584d

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 16:10:24 +0000 (09:10 -0700)]

am 12d4b5dd: am eddc3ca4: am f35ee031: am 01a4beb1: Fix history original image Change 1st and 2nd panel background color

* commit '12d4b5dd3536fe3532d1f28dd8d27fcec41b4612':
Fix history original image Change 1st and 2nd panel background color

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 16:07:05 +0000 (09:07 -0700)]

am eddc3ca4: am f35ee031: am 01a4beb1: Fix history original image Change 1st and 2nd panel background color

* commit 'eddc3ca420d53bfc818b6d6732239de8a95a709c':
Fix history original image Change 1st and 2nd panel background color

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 16:04:55 +0000 (09:04 -0700)]

am f35ee031: am 01a4beb1: Fix history original image Change 1st and 2nd panel background color

* commit 'f35ee0318655de92bb37c3763c750f8cff77131d':
Fix history original image Change 1st and 2nd panel background color

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 16:03:12 +0000 (09:03 -0700)]

am 01a4beb1: Fix history original image Change 1st and 2nd panel background color

* commit '01a4beb197d74dddf788efaf6aedef434dfb8f8f':
Fix history original image Change 1st and 2nd panel background color

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 15:57:59 +0000 (08:57 -0700)]

Fix history original image
Change 1st and 2nd panel background color

Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 15:51:24 +0000 (08:51 -0700)]

am e83856fe: am f928d8ee: am 5aff32af: am 948a4e6e: Fix history panel first appearance

* commit 'e83856fe6f891d1257e9282b5c965853eb630593':
Fix history panel first appearance

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 15:47:42 +0000 (08:47 -0700)]

am f928d8ee: am 5aff32af: am 948a4e6e: Fix history panel first appearance

* commit 'f928d8ee846e06893c14acee8127c85e971df462':
Fix history panel first appearance

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 15:45:26 +0000 (08:45 -0700)]

am 5aff32af: am 948a4e6e: Fix history panel first appearance

* commit '5aff32afed49528cb104cdcf912bedf6f3440d9b':
Fix history panel first appearance

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 15:42:02 +0000 (08:42 -0700)]

am 948a4e6e: Fix history panel first appearance

* commit '948a4e6e38d8d9ec9926877524478d6692437105':
Fix history panel first appearance

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 15:18:18 +0000 (08:18 -0700)]

Fix history panel first appearance

Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 04:21:07 +0000 (21:21 -0700)]

am b1a84f1e: am 3b39df6d: am 8fafeaff: am d98f781d: Fix positioning of cancel/done buttons

* commit 'b1a84f1ed70965198b1c0d1ed957d866b449670f':
Fix positioning of cancel/done buttons

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 04:17:06 +0000 (21:17 -0700)]

am 3b39df6d: am 8fafeaff: am d98f781d: Fix positioning of cancel/done buttons

* commit '3b39df6d0fbb4f6e3435c7e2efc6095c6d709052':
Fix positioning of cancel/done buttons

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 04:14:03 +0000 (21:14 -0700)]

am 8fafeaff: am d98f781d: Fix positioning of cancel/done buttons

* commit '8fafeaff4820fe88cd9f854c79fac90b8040f5c2':
Fix positioning of cancel/done buttons

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 04:10:13 +0000 (21:10 -0700)]

am d98f781d: Fix positioning of cancel/done buttons

* commit 'd98f781dd0899477ff5be42279a06da81fd6e526':
Fix positioning of cancel/done buttons

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 03:54:45 +0000 (20:54 -0700)]

Fix positioning of cancel/done buttons

Change-Id: Ie229a20d882841444ece28a3ab63cbc6ea916699

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 03:24:57 +0000 (20:24 -0700)]

am c52ab9b0: am 171b216c: am 923140cf: am 1fe7caee: Fix crash in curves

* commit 'c52ab9b0364cb7f540d8424536b586f6c9de7713':
Fix crash in curves

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 03:22:37 +0000 (20:22 -0700)]

am 171b216c: am 923140cf: am 1fe7caee: Fix crash in curves

* commit '171b216c4a3920a869aa748f9d1254a041e07f1b':
Fix crash in curves

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 03:20:28 +0000 (20:20 -0700)]

am 923140cf: am 1fe7caee: Fix crash in curves

* commit '923140cf2301ed611568cb9da3a88a725d2328f0':
Fix crash in curves

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 03:17:02 +0000 (20:17 -0700)]

am 1fe7caee: Fix crash in curves

* commit '1fe7caeeaab314cd70d0b54f8f3dd3225c71c081':
Fix crash in curves

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 03:15:50 +0000 (20:15 -0700)]

am 04dad18e: am a8c64209: am 70071d7b: am 16652433: make basic editor based on ParametricEditor

* commit '04dad18eb5419ab5bfa85dc156571c8eea106933':
make basic editor based on ParametricEditor

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 03:13:51 +0000 (20:13 -0700)]

am a8c64209: am 70071d7b: am 16652433: make basic editor based on ParametricEditor

* commit 'a8c642098aea0edb6af0ecbaf23fc5a768773cbf':
make basic editor based on ParametricEditor

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 03:11:47 +0000 (20:11 -0700)]

am 70071d7b: am 16652433: make basic editor based on ParametricEditor

* commit '70071d7b940debe0ddf77c8306ce33dcadc35638':
make basic editor based on ParametricEditor

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 03:09:47 +0000 (20:09 -0700)]

am 16652433: make basic editor based on ParametricEditor

* commit '166524339e9f8ad86c0922142b961776e0da3d8f':
make basic editor based on ParametricEditor

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 03:07:47 +0000 (20:07 -0700)]

Fix crash in curves

Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49

commit | commitdiff | tree

John Hoford [Tue, 9 Apr 2013 02:32:45 +0000 (19:32 -0700)]

make basic editor based on ParametricEditor

Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 02:32:34 +0000 (19:32 -0700)]

am a6fa496b: am c2a0f3f2: am 78561589: am 719fa31b: Deactivate Vintage & BW Color FX

* commit 'a6fa496b3254ce07a7ffebf374a32724b7fb4ce5':
Deactivate Vintage & BW Color FX

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 02:28:32 +0000 (19:28 -0700)]

am c2a0f3f2: am 78561589: am 719fa31b: Deactivate Vintage & BW Color FX

* commit 'c2a0f3f2f421e61e445c8a8477812a46c0b257e3':
Deactivate Vintage & BW Color FX

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 02:25:27 +0000 (19:25 -0700)]

am 78561589: am 719fa31b: Deactivate Vintage & BW Color FX

* commit '78561589c611172fd0a1b4644416c4ea03022ac1':
Deactivate Vintage & BW Color FX

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 02:22:20 +0000 (19:22 -0700)]

am a9b85b2d: am d6dbe79e: am e507b716: am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

* commit 'a9b85b2d211ba726b21efa323e5e94a2b8ea4289':
Add menu item to start the simple editor

commit | commitdiff | tree

Bart Sears [Tue, 9 Apr 2013 02:22:19 +0000 (19:22 -0700)]

am 7aacffb3: am 3475ecf1: am 17f6f33a: am 5317e540: Bump up the version number to 1.1.40009

* commit '7aacffb385e226dc1462cee9c2c3bbe2eb093eb4':
Bump up the version number to 1.1.40009

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 02:21:29 +0000 (19:21 -0700)]

am 719fa31b: Deactivate Vintage & BW Color FX

* commit '719fa31bc4df6605f45a65feb504d5c4e6e59db3':
Deactivate Vintage & BW Color FX

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 02:15:31 +0000 (19:15 -0700)]

am d6dbe79e: am e507b716: am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

* commit 'd6dbe79efc4cdf0a3ecc5f50d33040ad6afb06ca':
Add menu item to start the simple editor

commit | commitdiff | tree

Bart Sears [Tue, 9 Apr 2013 02:15:30 +0000 (19:15 -0700)]

am 3475ecf1: am 17f6f33a: am 5317e540: Bump up the version number to 1.1.40009

* commit '3475ecf1e0a8ecbdaaee019a9bab6d87873de0a2':
Bump up the version number to 1.1.40009

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 02:06:51 +0000 (19:06 -0700)]

Deactivate Vintage & BW Color FX

bug:8503451
Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 01:56:31 +0000 (18:56 -0700)]

am e507b716: am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

* commit 'e507b716011e8a99f006f7009704fc0f87f0c3c4':
Add menu item to start the simple editor

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 01:54:18 +0000 (18:54 -0700)]

am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

* commit '387fffa4034e94336d5b2b28bf2cf7d0a9cf6048':
Add menu item to start the simple editor

commit | commitdiff | tree

Bart Sears [Tue, 9 Apr 2013 01:53:02 +0000 (18:53 -0700)]

am 17f6f33a: am 5317e540: Bump up the version number to 1.1.40009

* commit '17f6f33acf86bf90d22f73aa7257a00ec0663fa4':
Bump up the version number to 1.1.40009

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 01:50:45 +0000 (01:50 +0000)]

Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce

commit | commitdiff | tree

Bart Sears [Tue, 9 Apr 2013 01:49:07 +0000 (18:49 -0700)]

am 5317e540: Bump up the version number to 1.1.40009

* commit '5317e54019bc1c88c82333a9e42882623691270f':
Bump up the version number to 1.1.40009

commit | commitdiff | tree

nicolasroard [Tue, 9 Apr 2013 01:16:17 +0000 (18:16 -0700)]

Add menu item to start the simple editor

Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0

commit | commitdiff | tree

Bart Sears [Tue, 9 Apr 2013 01:12:07 +0000 (18:12 -0700)]

Bump up the version number to 1.1.40009

Change-Id: Ia266e6493a535cd4ae36fda2fa497195b810ebb4

commit | commitdiff | tree

Tim Murray [Tue, 9 Apr 2013 00:10:09 +0000 (17:10 -0700)]

am d460568e: am c4435097: am 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce

* commit 'd460568ed334df054ac6551f0933e30337ae1b97':
Allow use of texture.

commit | commitdiff | tree

Tim Murray [Tue, 9 Apr 2013 00:10:08 +0000 (17:10 -0700)]

am 0b103f1b: am c1e80002: am 3627907b: am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

* commit '0b103f1beab869563fe1100cdd592c129fa936ba':
Limit creation of greyscale converter RS script.

commit | commitdiff | tree

Tim Murray [Tue, 9 Apr 2013 00:05:31 +0000 (17:05 -0700)]

am c4435097: am 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce

* commit 'c443509795eff3a832f9e3be806d05cf8490cdff':
Allow use of texture.

commit | commitdiff | tree

Tim Murray [Tue, 9 Apr 2013 00:05:30 +0000 (17:05 -0700)]

am c1e80002: am 3627907b: am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

* commit 'c1e8000207d979f231adc8dbc50c385213c4e679':
Limit creation of greyscale converter RS script.

commit | commitdiff | tree

Tim Murray [Mon, 8 Apr 2013 22:09:11 +0000 (15:09 -0700)]

am 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce

* commit '893ea430c9d3f78291843e22f4370319af0b2451':
Allow use of texture.

commit | commitdiff | tree

Tim Murray [Mon, 8 Apr 2013 22:09:11 +0000 (15:09 -0700)]

am 3627907b: am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

* commit '3627907b3bfdb03c596fe01437a3fc4300ad25a1':
Limit creation of greyscale converter RS script.

commit | commitdiff | tree

Tim Murray [Mon, 8 Apr 2013 22:05:15 +0000 (15:05 -0700)]

am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce

* commit '31721073a7fae162a931f1d4998b12101a98916c':
Allow use of texture.

commit | commitdiff | tree

Tim Murray [Mon, 8 Apr 2013 22:05:15 +0000 (15:05 -0700)]

am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

* commit 'a8d4e88207432fc07385d49245ca2221d6fe0be9':
Limit creation of greyscale converter RS script.

commit | commitdiff | tree

Tim Murray [Mon, 8 Apr 2013 22:02:01 +0000 (22:02 +0000)]

Merge "Allow use of texture." into gb-ub-photos-bryce

commit | commitdiff | tree

Tim Murray [Mon, 8 Apr 2013 22:01:53 +0000 (22:01 +0000)]

Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce

commit | commitdiff | tree

Tim Murray [Mon, 8 Apr 2013 21:33:51 +0000 (14:33 -0700)]

Allow use of texture.

Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf

commit | commitdiff | tree

Tim Murray [Mon, 8 Apr 2013 17:35:09 +0000 (10:35 -0700)]

Limit creation of greyscale converter RS script.

Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067

commit | commitdiff | tree

John Hoford [Mon, 8 Apr 2013 21:43:31 +0000 (14:43 -0700)]

am 1c29ca03: am e4cab3e2: am a97306fc: am f1d6d21d: Increase the CHAR LIMIT for color_pick_select

* commit '1c29ca03ccafb013af77757e2774454ba7d32601':
Increase the CHAR LIMIT for color_pick_select

commit | commitdiff | tree

John Hoford [Mon, 8 Apr 2013 21:40:57 +0000 (14:40 -0700)]

am e4cab3e2: am a97306fc: am f1d6d21d: Increase the CHAR LIMIT for color_pick_select

* commit 'e4cab3e24d58ac111c853ae8de51670ff19f7539':
Increase the CHAR LIMIT for color_pick_select

commit | commitdiff | tree

John Hoford [Mon, 8 Apr 2013 21:37:41 +0000 (14:37 -0700)]

am a97306fc: am f1d6d21d: Increase the CHAR LIMIT for color_pick_select

* commit 'a97306fc282087e6a67347d5f6c36923962b16df':
Increase the CHAR LIMIT for color_pick_select

commit | commitdiff | tree

John Hoford [Mon, 8 Apr 2013 21:34:03 +0000 (14:34 -0700)]

am f1d6d21d: Increase the CHAR LIMIT for color_pick_select

* commit 'f1d6d21dfcf59d69a7ba8a3658fcedbf2aa04779':
Increase the CHAR LIMIT for color_pick_select

commit | commitdiff | tree

The Android Open Source Project [Mon, 8 Apr 2013 20:47:57 +0000 (13:47 -0700)]

am b9ac669d: (-s ours) am 9cacd519: Reconcile with jb-mr2-release - do not merge

* commit 'b9ac669d3fc91d7de1231cd60e70591483367e71':

commit | commitdiff | tree

The Android Open Source Project [Mon, 8 Apr 2013 20:40:42 +0000 (13:40 -0700)]

am 9cacd519: Reconcile with jb-mr2-release - do not merge

* commit '9cacd519354bb5249a9cc3ac05d3220748c24a16':

commit | commitdiff | tree

The Android Open Source Project [Mon, 8 Apr 2013 20:36:23 +0000 (13:36 -0700)]

Reconcile with jb-mr2-release - do not merge

Change-Id: I4014afe3d67f5b17d5877083bdea8e34bf32ab9e

commit | commitdiff | tree

John Hoford [Mon, 8 Apr 2013 19:40:17 +0000 (12:40 -0700)]

Increase the CHAR LIMIT for color_pick_select

bug: 8131770
Change-Id: I665316d3ff6ec10fcace8ee1bb9237f4057a4797

commit | commitdiff | tree

John Hoford [Mon, 8 Apr 2013 16:24:53 +0000 (09:24 -0700)]

am b29d6806: am 469bc0ef: am 4b87a0bd: am 7ce32619: support for simplified computed icons

* commit 'b29d68063788f96c2805c0abf93f1a202fb6f291':
support for simplified computed icons

commit | commitdiff | tree

John Hoford [Mon, 8 Apr 2013 16:21:18 +0000 (09:21 -0700)]

am 469bc0ef: am 4b87a0bd: am 7ce32619: support for simplified computed icons

* commit '469bc0efed25ec4a8d40bfdfa3997931eb1a7383':
support for simplified computed icons

commit | commitdiff | tree

John Hoford [Mon, 8 Apr 2013 16:18:12 +0000 (09:18 -0700)]

am 4b87a0bd: am 7ce32619: support for simplified computed icons

* commit '4b87a0bdc331993b0bc6fa46efb11b62abcc8dfb':
support for simplified computed icons

commit | commitdiff | tree

John Hoford [Mon, 8 Apr 2013 16:14:07 +0000 (09:14 -0700)]

am 7ce32619: support for simplified computed icons

* commit '7ce32619d3f107125d219b80c4041681a0bd85cc':
support for simplified computed icons

commit | commitdiff | tree

John Hoford [Fri, 5 Apr 2013 15:48:39 +0000 (08:48 -0700)]

support for simplified computed icons

Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd

commit | commitdiff | tree

The Android Automerger [Mon, 8 Apr 2013 12:56:50 +0000 (05:56 -0700)]

merge in jb-mr2-release history after reset to jb-mr2-dev

commit | commitdiff | tree

Bart Sears [Sat, 6 Apr 2013 00:08:36 +0000 (17:08 -0700)]

am 00775fa8: am 8c880d68: am be89575f: am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

* commit '00775fa875227293344a3b9b72680985995ddaf5':
Bump up the version number to 1.1.40008

commit | commitdiff | tree

Bart Sears [Sat, 6 Apr 2013 00:01:30 +0000 (17:01 -0700)]

am 8c880d68: am be89575f: am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

* commit '8c880d68b72aad2af1588b75a5e68ccaf6ab6910':
Bump up the version number to 1.1.40008

commit | commitdiff | tree

Bart Sears [Fri, 5 Apr 2013 23:59:15 +0000 (16:59 -0700)]

am be89575f: am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

* commit 'be89575f1dd99651b3e4979bd5eda06c13ab54b0':
Bump up the version number to 1.1.40008

commit | commitdiff | tree

Ruben Brunk [Fri, 5 Apr 2013 23:57:52 +0000 (16:57 -0700)]

am b514ae67: am 80b49106: am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags.

* commit 'b514ae67360c7c33656767a1c28240c316108df3':
Added check to strip out uninitialized EXIF tags.

commit | commitdiff | tree

Ruben Brunk [Fri, 5 Apr 2013 23:54:22 +0000 (16:54 -0700)]

am 80b49106: am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags.

* commit '80b491062306ab817a63cb0f195fa00ae0c74fb5':
Added check to strip out uninitialized EXIF tags.

commit | commitdiff | tree

Bart Sears [Fri, 5 Apr 2013 23:54:04 +0000 (16:54 -0700)]

am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

* commit '08ac58de117c2b8c24ef8b4eabca6d25ae581ff3':
Bump up the version number to 1.1.40008

commit | commitdiff | tree

Bart Sears [Fri, 5 Apr 2013 23:51:42 +0000 (23:51 +0000)]

Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce

commit | commitdiff | tree

Ruben Brunk [Fri, 5 Apr 2013 23:48:39 +0000 (16:48 -0700)]

am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags.

* commit '351f96eeacc4342385ee2d215af1322ac079cfdc':
Added check to strip out uninitialized EXIF tags.

commit | commitdiff | tree

Ruben Brunk [Fri, 5 Apr 2013 23:44:56 +0000 (16:44 -0700)]

am c59be382: Added check to strip out uninitialized EXIF tags.

* commit 'c59be38287ed3d58f6945d63713b03ac20510c22':
Added check to strip out uninitialized EXIF tags.

commit | commitdiff | tree

Ruben Brunk [Fri, 5 Apr 2013 23:22:55 +0000 (16:22 -0700)]

Added check to strip out uninitialized EXIF tags.

Bug: 8552339
Change-Id: Ib6ae4f59f9e393e5f6b46877a4b2c3b2fe1852d3

commit | commitdiff | tree

Bart Sears [Fri, 5 Apr 2013 21:55:58 +0000 (14:55 -0700)]

Bump up the version number to 1.1.40008

Change-Id: I42dce1bc936b54a4d4f72c2179d2f1d9e27f72d7

commit | commitdiff | tree

Baligh Uddin [Fri, 5 Apr 2013 19:15:54 +0000 (12:15 -0700)]

am 526bcbb1: (-s ours) am b0cf2dcd: am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '526bcbb1699dc08962e39aeee2129a085c1c028a':
Import translations. DO NOT MERGE