OSDN Git Service
Baligh Uddin [Wed, 10 Apr 2013 20:04:00 +0000 (13:04 -0700)]
am
35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
35e29cb6f248176682fd88b6a7bf8c99487551ff':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 10 Apr 2013 19:57:38 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Bobby Georgescu [Wed, 10 Apr 2013 19:47:39 +0000 (12:47 -0700)]
am
f5e37e42: am
6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
* commit '
f5e37e421790f01024f846d4bc45c6da0c00fb3f':
Correctly scale images in MTP importer
Bobby Georgescu [Wed, 10 Apr 2013 19:42:13 +0000 (12:42 -0700)]
am
6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
* commit '
6b138c2240d35571e1f49258f84ec2659223d251':
Correctly scale images in MTP importer
Bobby Georgescu [Wed, 10 Apr 2013 19:39:42 +0000 (19:39 +0000)]
Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
Ruben Brunk [Wed, 10 Apr 2013 18:56:43 +0000 (11:56 -0700)]
am
3bc8cc41: am
b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
* commit '
3bc8cc417e7b874b7b3f401cc33f073756762ebf':
Adding simple crop ui. Refactoring.
Baligh Uddin [Wed, 10 Apr 2013 18:52:53 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9789a0f1295136ca95b2d7b19d7fa6f0dc13e192
Auto-generated-cl: translation import
Ruben Brunk [Wed, 10 Apr 2013 18:52:51 +0000 (11:52 -0700)]
am
b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
* commit '
b6b2d1c45f889ca0388b11bb49ae0ce1a1694e90':
Adding simple crop ui. Refactoring.
Bobby Georgescu [Wed, 10 Apr 2013 18:46:56 +0000 (11:46 -0700)]
Correctly scale images in MTP importer
Bug:
8293048
Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
Ruben Brunk [Wed, 10 Apr 2013 18:47:38 +0000 (18:47 +0000)]
Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
ztenghui [Wed, 10 Apr 2013 18:35:43 +0000 (11:35 -0700)]
am
a1a67123: am
3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
* commit '
a1a67123245321d970058d668ca50bb218bddb19':
Use MediaMuxer for the video trim and mute.
ztenghui [Wed, 10 Apr 2013 18:31:34 +0000 (11:31 -0700)]
am
3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
* commit '
3eb2fb4dd2ede7f65ee307061213f0e8860f15f6':
Use MediaMuxer for the video trim and mute.
ztenghui [Wed, 10 Apr 2013 18:19:57 +0000 (18:19 +0000)]
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
ztenghui [Mon, 8 Apr 2013 21:37:53 +0000 (14:37 -0700)]
Use MediaMuxer for the video trim and mute.
bug:
8548085
Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
Angus Kong [Wed, 10 Apr 2013 17:41:55 +0000 (10:41 -0700)]
am
0c22972b: am
2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
* commit '
0c22972b061dd2f458eb1185702c2b4ac8d13d1a':
Refactor CameraDataAdapter for other data types.
Angus Kong [Wed, 10 Apr 2013 17:39:18 +0000 (10:39 -0700)]
am
2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
* commit '
2fc6641b80a7aedf54062cbd01c40cbf0764a6ca':
Refactor CameraDataAdapter for other data types.
Angus Kong [Wed, 10 Apr 2013 17:35:58 +0000 (17:35 +0000)]
Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
The Android Open Source Project [Wed, 10 Apr 2013 17:05:54 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I1ffbbe79376c9e0f93dea90e11dfb86b07715328
nicolasroard [Wed, 10 Apr 2013 16:12:12 +0000 (09:12 -0700)]
am
8656a57c: am
3bc806a8: Small cleanup in setting resources
* commit '
8656a57c6cbbae23cc4fa5ede0b3e816864dc12f':
Small cleanup in setting resources
nicolasroard [Wed, 10 Apr 2013 16:10:00 +0000 (09:10 -0700)]
am
3bc806a8: Small cleanup in setting resources
* commit '
3bc806a8575072c9459fe3698675d3713300d1d3':
Small cleanup in setting resources
nicolasroard [Wed, 10 Apr 2013 15:20:26 +0000 (08:20 -0700)]
Small cleanup in setting resources
Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
nicolasroard [Wed, 10 Apr 2013 14:33:36 +0000 (07:33 -0700)]
am
990e5979: am
e29b5733: Add a third pipeline reserved for the high res preview
* commit '
990e59793b569db2552cced4aae55194814a3001':
Add a third pipeline reserved for the high res preview
nicolasroard [Wed, 10 Apr 2013 14:31:19 +0000 (07:31 -0700)]
am
e29b5733: Add a third pipeline reserved for the high res preview
* commit '
e29b57330be471dd74672a7bdc74a93dcae3a98b':
Add a third pipeline reserved for the high res preview
The Android Automerger [Wed, 10 Apr 2013 12:56:44 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ruben Brunk [Wed, 10 Apr 2013 07:11:46 +0000 (00:11 -0700)]
Adding simple crop ui. Refactoring.
Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540
nicolasroard [Wed, 10 Apr 2013 01:43:31 +0000 (18:43 -0700)]
Add a third pipeline reserved for the high res preview
Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
Angus Kong [Mon, 8 Apr 2013 23:57:57 +0000 (16:57 -0700)]
Refactor CameraDataAdapter for other data types.
Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
John Hoford [Wed, 10 Apr 2013 01:35:26 +0000 (18:35 -0700)]
am
81dac121: am
701955ac: Merge "support icon styles" into gb-ub-photos-bryce
* commit '
81dac121ec44462ef68dc1b41de75c3f630997db':
support icon styles
nicolasroard [Wed, 10 Apr 2013 01:35:26 +0000 (18:35 -0700)]
am
e8cf8a59: am
7668544e: Detach old editor
* commit '
e8cf8a5931d8933963c64f2d09b2118d8f80f7be':
Detach old editor
John Hoford [Wed, 10 Apr 2013 01:21:56 +0000 (18:21 -0700)]
am
701955ac: Merge "support icon styles" into gb-ub-photos-bryce
* commit '
701955ac93bb05bff2a826c79ea60f921b3745fc':
support icon styles
nicolasroard [Wed, 10 Apr 2013 01:21:55 +0000 (18:21 -0700)]
am
7668544e: Detach old editor
* commit '
7668544ee3e8ba3b14d127b9ecd1cf4a3b2f3e11':
Detach old editor
John Hoford [Wed, 10 Apr 2013 00:56:32 +0000 (00:56 +0000)]
Merge "support icon styles" into gb-ub-photos-bryce
nicolasroard [Wed, 10 Apr 2013 00:52:08 +0000 (17:52 -0700)]
Detach old editor
Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
John Hoford [Wed, 10 Apr 2013 00:47:24 +0000 (17:47 -0700)]
support icon styles
Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
nicolasroard [Tue, 9 Apr 2013 23:47:10 +0000 (16:47 -0700)]
am
3c11e0a2: am
8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
* commit '
3c11e0a234925657a4c9b59bdda10342e4412c55':
Implements swipe in editor menu
nicolasroard [Tue, 9 Apr 2013 23:43:39 +0000 (16:43 -0700)]
am
8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
* commit '
8eb8dd6ba1957d7e8e75e6fab9f5654ad55d2fe4':
Implements swipe in editor menu
nicolasroard [Tue, 9 Apr 2013 23:40:34 +0000 (23:40 +0000)]
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
Ruben Brunk [Tue, 9 Apr 2013 23:15:11 +0000 (16:15 -0700)]
am
80e32c08: am
4c644f36: Fix to imports in NewPhotoModule.
* commit '
80e32c082f971c88627692b3faa4656390439f66':
Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:12:30 +0000 (16:12 -0700)]
am
4c644f36: Fix to imports in NewPhotoModule.
* commit '
4c644f3687d88ea13ff82c3f79b36585ea2c387b':
Fix to imports in NewPhotoModule.
Ruben Brunk [Tue, 9 Apr 2013 23:07:35 +0000 (16:07 -0700)]
Fix to imports in NewPhotoModule.
Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef
Ruben Brunk [Tue, 9 Apr 2013 23:04:13 +0000 (16:04 -0700)]
am
1b34000f: am
dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
* commit '
1b34000f478e616a9681623385255418ed562ae6':
Moving crop to a separate activity. Refactoring.
Ruben Brunk [Tue, 9 Apr 2013 23:01:18 +0000 (16:01 -0700)]
am
dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
* commit '
dcd1dd986bc8455ce822e8d9e7a46ea103228351':
Moving crop to a separate activity. Refactoring.
Ruben Brunk [Tue, 9 Apr 2013 22:59:08 +0000 (22:59 +0000)]
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
Ruben Brunk [Fri, 5 Apr 2013 00:20:42 +0000 (17:20 -0700)]
Moving crop to a separate activity. Refactoring.
Bug:
8526929
Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
nicolasroard [Tue, 9 Apr 2013 22:29:35 +0000 (15:29 -0700)]
Implements swipe in editor menu
Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
Angus Kong [Tue, 9 Apr 2013 21:53:46 +0000 (14:53 -0700)]
am
1d18d4f2: am
355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
* commit '
1d18d4f2552df090c3da69aba29faba00f813d6c':
Add more gestures and animations in FilmStripView.
Angus Kong [Tue, 9 Apr 2013 21:51:58 +0000 (14:51 -0700)]
am
355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
* commit '
355eaea088a348c394909fea6c9f812ff25e87ac':
Add more gestures and animations in FilmStripView.
Angus Kong [Tue, 9 Apr 2013 21:49:55 +0000 (21:49 +0000)]
Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
Angus Kong [Tue, 9 Apr 2013 21:16:39 +0000 (14:16 -0700)]
am
6b775d62: am
7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce
* commit '
6b775d626cffc2b863da881e800238816caae818':
Refresh parameters during recording.
Angus Kong [Tue, 9 Apr 2013 21:12:48 +0000 (14:12 -0700)]
am
7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce
* commit '
7811d8def7fe1b9d6111566b55a18f6b137f487a':
Refresh parameters during recording.
Angus Kong [Tue, 9 Apr 2013 21:09:38 +0000 (21:09 +0000)]
Merge "Refresh parameters during recording." into gb-ub-photos-bryce
Angus Kong [Wed, 3 Apr 2013 23:56:18 +0000 (16:56 -0700)]
Refresh parameters during recording.
bug:
8504803
Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
nicolasroard [Tue, 9 Apr 2013 20:38:59 +0000 (13:38 -0700)]
am
15d05dc7: am
a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce
* commit '
15d05dc79cdea1a43284883679093c8c5ac943a7':
Hide the category panel when editing
nicolasroard [Tue, 9 Apr 2013 20:35:18 +0000 (13:35 -0700)]
am
a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce
* commit '
a4ff177637432e9f1e5eeb29b9c5dc6bb2949b2a':
Hide the category panel when editing
nicolasroard [Tue, 9 Apr 2013 20:33:04 +0000 (20:33 +0000)]
Merge "Hide the category panel when editing" into gb-ub-photos-bryce
nicolasroard [Tue, 9 Apr 2013 18:46:53 +0000 (11:46 -0700)]
Hide the category panel when editing
Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96
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
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
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
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
John Hoford [Tue, 9 Apr 2013 20:02:06 +0000 (20:02 +0000)]
Merge "ui cleanup" into gb-ub-photos-bryce
John Hoford [Tue, 9 Apr 2013 18:51:42 +0000 (11:51 -0700)]
ui cleanup
Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
Bobby Georgescu [Mon, 8 Apr 2013 17:14:14 +0000 (10:14 -0700)]
Remove unneeded READ_SMS permission
Bug:
8469283
Change-Id: I0d211705fe1fb86dc0ce85230e82d500f0202291
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
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
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
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
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
nicolasroard [Tue, 9 Apr 2013 16:46:17 +0000 (09:46 -0700)]
Fix panel color background in landscape
Change-Id: Id1a0470c8df5fe39f5504a43e1602672ac0d584d
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
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
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
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
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
nicolasroard [Tue, 9 Apr 2013 15:18:18 +0000 (08:18 -0700)]
Fix history panel first appearance
Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22
The Android Automerger [Tue, 9 Apr 2013 12:56:04 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
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
nicolasroard [Tue, 9 Apr 2013 03:54:45 +0000 (20:54 -0700)]
Fix positioning of cancel/done buttons
Change-Id: Ie229a20d882841444ece28a3ab63cbc6ea916699
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
nicolasroard [Tue, 9 Apr 2013 03:17:02 +0000 (20:17 -0700)]
am
1fe7caee: Fix crash in curves
* commit '
1fe7caeeaab314cd70d0b54f8f3dd3225c71c081':
Fix crash in curves
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
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
nicolasroard [Tue, 9 Apr 2013 03:07:47 +0000 (20:07 -0700)]
Fix crash in curves
Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
John Hoford [Tue, 9 Apr 2013 02:32:45 +0000 (19:32 -0700)]
make basic editor based on ParametricEditor
Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61
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
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
nicolasroard [Tue, 9 Apr 2013 02:06:51 +0000 (19:06 -0700)]
Deactivate Vintage & BW Color FX
bug:
8503451
Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587
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
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
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
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
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
nicolasroard [Tue, 9 Apr 2013 01:16:17 +0000 (18:16 -0700)]
Add menu item to start the simple editor
Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
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
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.
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.
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.
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.
Tim Murray [Mon, 8 Apr 2013 22:02:01 +0000 (22:02 +0000)]
Merge "Allow use of texture." into gb-ub-photos-bryce
OSDN Git Service
