OSDN Git Service
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
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: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
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:28:32 +0000 (19:28 -0700)]
am
c2a0f3f2: am
78561589: am
719fa31b: Deactivate Vintage & BW Color FX
* commit '
c2a0f3f2f421e61e445c8a8477812a46c0b257e3':
Deactivate Vintage & BW Color FX
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: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
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
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 [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.
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.
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
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
Tim Murray [Mon, 8 Apr 2013 21:33:51 +0000 (14:33 -0700)]
Allow use of texture.
Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf
Tim Murray [Mon, 8 Apr 2013 17:35:09 +0000 (10:35 -0700)]
Limit creation of greyscale converter RS script.
Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067
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
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
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
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':
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
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
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
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
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
John Hoford [Fri, 5 Apr 2013 15:48:39 +0000 (08:48 -0700)]
support for simplified computed icons
Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd
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
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
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
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.
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
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
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.
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.
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
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
Baligh Uddin [Fri, 5 Apr 2013 19:12:33 +0000 (12:12 -0700)]
am
b0cf2dcd: am
20b837a9: am
f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
b0cf2dcda6279062b115a27efe4ce8aaecaa9546':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 19:12:32 +0000 (12:12 -0700)]
am
fd8906a0: am
88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
fd8906a0dc72cb2e816c2a9a5a8be7d27ca70e09':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 19:09:01 +0000 (12:09 -0700)]
am
20b837a9: am
f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
20b837a995a150ec4024324dd1b6874ff4f9113f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 19:09:00 +0000 (12:09 -0700)]
am
88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
88154ff2a4c440732aafdc80776e41affe9d8980':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 19:07:13 +0000 (12:07 -0700)]
am
f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
f9ee06b28b9e8992c25ac8ce48ac76a2990a44ec':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 19:02:34 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 5 Apr 2013 19:02:23 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 5 Apr 2013 19:02:11 +0000 (19:02 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Fri, 5 Apr 2013 18:35:02 +0000 (11:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic1ae7e1370f8b2c2350ccc4f0944d0e9d155f8aa
Auto-generated-cl: translation import
Baligh Uddin [Fri, 5 Apr 2013 18:34:40 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iade3eb6b07c585bd1e7a7ab9e0f3f8e74d512aeb
Auto-generated-cl: translation import
Baligh Uddin [Fri, 5 Apr 2013 18:34:17 +0000 (11:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e919072c23a9b7d081416f1f55dd5991381a56b
Auto-generated-cl: translation import
Michael Kolb [Fri, 5 Apr 2013 17:17:06 +0000 (10:17 -0700)]
am
47811c4c: am
b94167bd: am
5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce
* commit '
47811c4c307de0bbcabb08c0052ff4320f3bcc3e':
Don't add unsupported options to menu
Michael Kolb [Fri, 5 Apr 2013 17:14:50 +0000 (10:14 -0700)]
am
b94167bd: am
5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce
* commit '
b94167bd52a343d0c74a3b8bc0523f1747490a7e':
Don't add unsupported options to menu
Michael Kolb [Fri, 5 Apr 2013 17:11:41 +0000 (10:11 -0700)]
am
5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce
* commit '
5e1e5a5e301491249d24c9f3a4d1014d07e72985':
Don't add unsupported options to menu
Michael Kolb [Fri, 5 Apr 2013 17:08:40 +0000 (17:08 +0000)]
Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce
Michael Kolb [Fri, 5 Apr 2013 16:52:55 +0000 (09:52 -0700)]
Don't add unsupported options to menu
Bug:
8549712
Exposure compensation and whitebalance were not checked when added
to the menu.
Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df
ztenghui [Thu, 4 Apr 2013 23:09:03 +0000 (16:09 -0700)]
am
c8216ed7: am
e9ba7351: am
214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce
* commit '
c8216ed74ea214eb4fd0b10c308ace60cc003eeb':
Remove redudant setName
Bart Sears [Thu, 4 Apr 2013 23:09:02 +0000 (16:09 -0700)]
am
662f5176: am
5e575401: am
4f58f875: Bump up the version number to 1.1.40007
* commit '
662f5176f328be4379b42078de25866f5c8c47e1':
Bump up the version number to 1.1.40007
ztenghui [Thu, 4 Apr 2013 23:05:30 +0000 (16:05 -0700)]
am
e9ba7351: am
214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce
* commit '
e9ba7351f6598ec950c6df007448567dcaa555b6':
Remove redudant setName
Bart Sears [Thu, 4 Apr 2013 23:05:29 +0000 (16:05 -0700)]
am
5e575401: am
4f58f875: Bump up the version number to 1.1.40007
* commit '
5e575401757d93c4d18ba40f05d146bbdf6e9e6f':
Bump up the version number to 1.1.40007
ztenghui [Thu, 4 Apr 2013 23:00:59 +0000 (16:00 -0700)]
am
214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce
* commit '
214f786938fd0924ec89190b5f38d034f0be7291':
Remove redudant setName
Bart Sears [Thu, 4 Apr 2013 23:00:58 +0000 (16:00 -0700)]
am
4f58f875: Bump up the version number to 1.1.40007
* commit '
4f58f87598044f3742d6faaf1ac8ff777c7dcffc':
Bump up the version number to 1.1.40007
ztenghui [Thu, 4 Apr 2013 22:57:41 +0000 (22:57 +0000)]
Merge "Remove redudant setName" into gb-ub-photos-bryce
Bart Sears [Thu, 4 Apr 2013 22:07:12 +0000 (15:07 -0700)]
Bump up the version number to 1.1.40007
Change-Id: Ia494e2c210f642ec0232394d0cfabaf5e1b8f96a
ztenghui [Thu, 4 Apr 2013 17:28:43 +0000 (10:28 -0700)]
Remove redudant setName
Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c
John Hoford [Thu, 4 Apr 2013 15:53:52 +0000 (08:53 -0700)]
am
cecc50f5: am
e65a9f48: am
3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
* commit '
cecc50f599ddef3cc8db7552354f40c5b2a9887b':
fixed the value that quality was getting set to
John Hoford [Thu, 4 Apr 2013 15:50:24 +0000 (08:50 -0700)]
am
e65a9f48: am
3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
* commit '
e65a9f48a545f6ed2043e89cbe6637aeadf6c30a':
fixed the value that quality was getting set to
John Hoford [Thu, 4 Apr 2013 15:46:22 +0000 (08:46 -0700)]
am
3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
* commit '
3b7638527bf8f472bedf99ed412d692e4031d03e':
fixed the value that quality was getting set to
John Hoford [Thu, 4 Apr 2013 15:42:50 +0000 (15:42 +0000)]
Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
The Android Automerger [Thu, 4 Apr 2013 12:55:56 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 4 Apr 2013 01:05:27 +0000 (18:05 -0700)]
am
1a37c1b0: Reconcile with jb-mr2-release - do not merge
* commit '
1a37c1b012e4c38cafa1c4e945cd8cd690e7e105':
am
2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
am
0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
John Hoford [Wed, 3 Apr 2013 23:53:04 +0000 (16:53 -0700)]
fixed the value that quality was getting set to
Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4
The Android Open Source Project [Wed, 3 Apr 2013 23:43:37 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I666a136b9a745370acd7ed37cb78c19939d6ac00
Michael Kolb [Wed, 3 Apr 2013 23:19:34 +0000 (16:19 -0700)]
am
20462495: am
00d755f4: am
56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce
* commit '
2046249565caca3df9806e5ebdddafb328535608':
Adjust camera menu further
Michael Kolb [Wed, 3 Apr 2013 23:16:33 +0000 (16:16 -0700)]
am
00d755f4: am
56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce
* commit '
00d755f4bdd39307ffb9e9372393047cb7c97e0a':
Adjust camera menu further
Michael Kolb [Wed, 3 Apr 2013 23:12:14 +0000 (16:12 -0700)]
am
56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce
* commit '
56b8463ae34900368f735d9ba75ac39d635ad7cc':
Adjust camera menu further
Michael Kolb [Wed, 3 Apr 2013 23:09:48 +0000 (23:09 +0000)]
Merge "Adjust camera menu further" into gb-ub-photos-bryce
Angus Kong [Wed, 3 Apr 2013 23:07:08 +0000 (16:07 -0700)]
am
fe8a8a7b: am
6db9f6ff: am
a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce
* commit '
fe8a8a7bff1956d30ab3b421aa44ed194ae4886c':
Don't access mParameters dirty bit in other thread
Angus Kong [Wed, 3 Apr 2013 22:46:44 +0000 (15:46 -0700)]
am
6db9f6ff: am
a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce
* commit '
6db9f6ff79c991ade56e226ecc24bd5b14d132cc':
Don't access mParameters dirty bit in other thread
Angus Kong [Wed, 3 Apr 2013 22:45:03 +0000 (15:45 -0700)]
am
a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce
* commit '
a2dcdfe34f634cc07acfcf92d8829a0373cec969':
Don't access mParameters dirty bit in other thread
Angus Kong [Wed, 3 Apr 2013 22:41:53 +0000 (22:41 +0000)]
Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce
Michael Kolb [Tue, 2 Apr 2013 23:03:04 +0000 (16:03 -0700)]
Adjust camera menu further
Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
Baligh Uddin [Wed, 3 Apr 2013 22:08:31 +0000 (15:08 -0700)]
am
f99b3c68: am
e9364e70: am
e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
f99b3c68ccc6f2c9ed21c7ae40524cee45de0fc0':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 22:08:30 +0000 (15:08 -0700)]
am
5fde40c5: am
3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
5fde40c5968c7fc14149366dbea6641e6215fcdb':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 22:08:23 +0000 (15:08 -0700)]
am
e80d06c6: am
5fdb5643: am
7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
e80d06c63c12f389460dd6a64daae561d7d217f4':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 22:08:22 +0000 (15:08 -0700)]
am
a46448ef: am
1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
a46448ef00af9b9a07686f6c58f5dcbe1475b4c9':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 22:06:23 +0000 (15:06 -0700)]
am
e9364e70: am
e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
e9364e70a2b70a5cab4a6ec0f59714d2b5c367c8':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 22:06:23 +0000 (15:06 -0700)]
am
3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
3c2780c1cb4472a0ba62b3d913c8d06055a82e00':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 22:02:43 +0000 (15:02 -0700)]
am
5fdb5643: am
7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
5fdb564375b04761aea41b47b0f1da8e6299a40a':
Import translations. DO NOT MERGE
OSDN Git Service
