OSDN Git Service
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 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
Baligh Uddin [Wed, 3 Apr 2013 22:02:42 +0000 (15:02 -0700)]
am
1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
1573bd489792795983639ccbdb8a88dae3c34d68':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 22:01:43 +0000 (15:01 -0700)]
am
e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
e4ec8797892e0fa6fe91b874b0fab584ecb03055':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 22:00:51 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 3 Apr 2013 22:00:41 +0000 (22:00 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 21:58:43 +0000 (21:58 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Baligh Uddin [Wed, 3 Apr 2013 21:58:38 +0000 (14:58 -0700)]
am
7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
* commit '
7f1ca673ab787c916c07f35ad3a5c868eb700ada':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 21:58:18 +0000 (21:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 3 Apr 2013 21:57:29 +0000 (21:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 3 Apr 2013 21:56:08 +0000 (21:56 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Doris Liu [Wed, 3 Apr 2013 21:16:36 +0000 (14:16 -0700)]
am
cd1b8043: am
d922866f: am
048a61c7: Improve black bar to keep camera controls in place
* commit '
cd1b804318e5de51cbb182ab52ca1202c5143349':
Improve black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 21:11:29 +0000 (14:11 -0700)]
am
d922866f: am
048a61c7: Improve black bar to keep camera controls in place
* commit '
d922866fa47d55a64bc63ec0b292897046065c33':
Improve black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 21:09:08 +0000 (14:09 -0700)]
am
048a61c7: Improve black bar to keep camera controls in place
* commit '
048a61c7ab3f63688faeb39c253251e58f30c5f8':
Improve black bar to keep camera controls in place
Doris Liu [Wed, 3 Apr 2013 00:48:56 +0000 (17:48 -0700)]
Improve black bar to keep camera controls in place
Bug:
8340996
Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
John Hoford [Wed, 3 Apr 2013 19:44:48 +0000 (12:44 -0700)]
am
a417518f: am
48f8d515: am
8ce4df01: fix touch action in draw
* commit '
a417518fc9a3c8c7c551cb57fce9dda5dca539b9':
fix touch action in draw
John Hoford [Wed, 3 Apr 2013 19:39:53 +0000 (12:39 -0700)]
am
48f8d515: am
8ce4df01: fix touch action in draw
* commit '
48f8d51527ecfeab71c0d23c9642b3c1d9059a5f':
fix touch action in draw
John Hoford [Wed, 3 Apr 2013 19:34:29 +0000 (12:34 -0700)]
am
8ce4df01: fix touch action in draw
* commit '
8ce4df0105e645aed8503c3f03c98c208621911d':
fix touch action in draw
Baligh Uddin [Wed, 3 Apr 2013 18:40:45 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ade9f6efc5d5b01ee88c5b4105ce7b18e4a2800
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Apr 2013 18:40:22 +0000 (11:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I23ea8bc294e56b060d63cc67059d4dd4f26b9143
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Apr 2013 18:39:53 +0000 (11:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I67a90d5cfd30f854cda228e0a5f54cd640813e16
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Apr 2013 18:38:48 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b763d7d7583883896263edab9697755911ef957
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Apr 2013 18:38:16 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2e0293945a088c14757a9bc734b05ac741b5de4d
Auto-generated-cl: translation import
Baligh Uddin [Wed, 3 Apr 2013 18:37:40 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3d22344797079b775de3781b0e3d8b73623dcec9
Auto-generated-cl: translation import
John Hoford [Wed, 3 Apr 2013 17:58:40 +0000 (10:58 -0700)]
fix touch action in draw
Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d
Angus Kong [Wed, 3 Apr 2013 00:59:30 +0000 (17:59 -0700)]
Don't access mParameters dirty bit in other thread
Change-Id: I067dd56975cc908f29ed7ba419572982c55b2063
The Android Automerger [Wed, 3 Apr 2013 13:02:48 +0000 (06:02 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
nicolasroard [Wed, 3 Apr 2013 06:20:56 +0000 (23:20 -0700)]
am
7b46e8db: am
0d74b562: am
2538c992: Fix segfaults in RS filters
* commit '
7b46e8db4d7535b2961e6bec1c8a60d04e82b3d4':
Fix segfaults in RS filters
nicolasroard [Wed, 3 Apr 2013 06:18:51 +0000 (23:18 -0700)]
am
0d74b562: am
2538c992: Fix segfaults in RS filters
* commit '
0d74b562db388f87f146931c410ccf3da1c72681':
Fix segfaults in RS filters
nicolasroard [Wed, 3 Apr 2013 06:16:52 +0000 (23:16 -0700)]
am
2538c992: Fix segfaults in RS filters
* commit '
2538c992dc70b3eda7487ef68dba0390b2f337d7':
Fix segfaults in RS filters
nicolasroard [Wed, 3 Apr 2013 05:22:37 +0000 (22:22 -0700)]
Fix segfaults in RS filters
We did not recreate the filters in all
cases when the input size change.
bug:
8530112
Change-Id: I4cb47498532618271b90e56c01ec63ad991db787
Ruben Brunk [Wed, 3 Apr 2013 02:25:11 +0000 (19:25 -0700)]
am
de689168: am
62e921d2: am
ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
* commit '
de68916887a055fd456bf6fe547da1e9101ae68f':
Speed improvements for ExifOutputStream.
John Hoford [Wed, 3 Apr 2013 02:25:10 +0000 (19:25 -0700)]
am
7f24dcdd: am
6d35b711: am
2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
* commit '
7f24dcdd259248102d42a6aa0986625c52956fa3':
fix calling Allocation.copyFrom without context
Angus Kong [Wed, 3 Apr 2013 02:25:03 +0000 (19:25 -0700)]
am
ef44ce86: am
e0193fa9: am
0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
* commit '
ef44ce8626f5ed7b60a4b3b69a8cfafefb6d8fe7':
Make stopPreview synchronous.
Ruben Brunk [Wed, 3 Apr 2013 02:25:03 +0000 (19:25 -0700)]
am
acd9cb30: am
f8f2b484: am
7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
* commit '
acd9cb3049984759d7a41ca1bbb85b086f5843cf':
Cleanup sloppy memory handling in ExifOutputStream.
John Hoford [Tue, 2 Apr 2013 23:47:12 +0000 (16:47 -0700)]
am
2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
* commit '
2b24604837aa9821d7e5ed409c2164ede803e0c4':
fix calling Allocation.copyFrom without context
Angus Kong [Tue, 2 Apr 2013 23:39:57 +0000 (16:39 -0700)]
am
0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
* commit '
0e018f44d4ecccd9be27bd4eac04957741ae57d2':
Make stopPreview synchronous.
OSDN Git Service
