OSDN Git Service
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
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
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
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
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 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.
Ruben Brunk [Tue, 2 Apr 2013 23:53:15 +0000 (16:53 -0700)]
am
62e921d2: am
ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
* commit '
62e921d237895fead41ad969cc03befcc760d6d5':
Speed improvements for ExifOutputStream.
John Hoford [Tue, 2 Apr 2013 23:53:14 +0000 (16:53 -0700)]
am
6d35b711: am
2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
* commit '
6d35b711ff02de4a9d22cc4a913cd34ed0b1c15b':
fix calling Allocation.copyFrom without context
Ruben Brunk [Tue, 2 Apr 2013 23:47:12 +0000 (16:47 -0700)]
am
ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
* commit '
ca926f9c13fdd3f813811b02782d4fb4fb79d7f5':
Speed improvements for 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
Ruben Brunk [Tue, 2 Apr 2013 23:47:03 +0000 (23:47 +0000)]
Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
Angus Kong [Tue, 2 Apr 2013 23:45:23 +0000 (16:45 -0700)]
am
e0193fa9: am
0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
* commit '
e0193fa9603e9fefe7b0f4640f7ac337e56fe7f4':
Make stopPreview synchronous.
Ruben Brunk [Tue, 2 Apr 2013 23:45:23 +0000 (16:45 -0700)]
am
f8f2b484: am
7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
* commit '
f8f2b48464627496fdb0e71d6f29b25942f5d3c4':
Cleanup sloppy memory handling in ExifOutputStream.
John Hoford [Tue, 2 Apr 2013 23:44:40 +0000 (23:44 +0000)]
Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
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.
Ruben Brunk [Tue, 2 Apr 2013 23:39:56 +0000 (16:39 -0700)]
am
7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
* commit '
7bf0f568f7e09275477f1ff2a4ac107274798329':
Cleanup sloppy memory handling in ExifOutputStream.
Angus Kong [Tue, 2 Apr 2013 23:05:03 +0000 (23:05 +0000)]
Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
John Hoford [Tue, 2 Apr 2013 22:55:55 +0000 (15:55 -0700)]
fix calling Allocation.copyFrom without context
bug:
8526929
Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
Ruben Brunk [Tue, 2 Apr 2013 20:15:57 +0000 (13:15 -0700)]
Speed improvements for ExifOutputStream.
Change-Id: I7d3ee9c157aefe67734e7b49cfa7868254c134ef
Ruben Brunk [Tue, 2 Apr 2013 22:19:05 +0000 (22:19 +0000)]
Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
Angus Kong [Tue, 2 Apr 2013 21:56:43 +0000 (14:56 -0700)]
Make stopPreview synchronous.
bug:
8517092
Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
Ruben Brunk [Tue, 2 Apr 2013 21:16:22 +0000 (14:16 -0700)]
Cleanup sloppy memory handling in ExifOutputStream.
Change-Id: Ifc34a958a6214fa89ee52cfbdeb6d53baa8cd3fd
Bobby Georgescu [Tue, 2 Apr 2013 20:19:12 +0000 (13:19 -0700)]
am
35542a64: am
d006c659: am
54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
* commit '
35542a64f34e2c349fb52499aca54365d9fd67a1':
Usage statistics for photo and video capture
Bobby Georgescu [Tue, 2 Apr 2013 20:15:11 +0000 (13:15 -0700)]
am
d006c659: am
54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
* commit '
d006c65988e61f4f8ebe0764139b673c2bd0f68d':
Usage statistics for photo and video capture
Bobby Georgescu [Tue, 2 Apr 2013 20:11:41 +0000 (13:11 -0700)]
am
54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
* commit '
54762e1e909d7bf85dc913414b047be9a499c18a':
Usage statistics for photo and video capture
Bobby Georgescu [Tue, 2 Apr 2013 20:09:50 +0000 (20:09 +0000)]
Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
The Android Open Source Project [Tue, 2 Apr 2013 18:04:16 +0000 (11:04 -0700)]
am
ad8d0e65: Reconcile with jb-mr2-release - do not merge
* commit '
ad8d0e6512b89af0310f454e7f16b710fef16e96':
am
ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
am
36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce
am
bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
Make camera releasing synchronous.
nicolasroard [Tue, 2 Apr 2013 18:03:39 +0000 (11:03 -0700)]
am
dd55e4c4: am
b1c06b88: am
20eb41f8: Fix stickiness issues with UI
* commit '
dd55e4c4816aabae250e28ea8b87ce41d1b416af':
Fix stickiness issues with UI
nicolasroard [Tue, 2 Apr 2013 18:03:39 +0000 (11:03 -0700)]
am
687baab4: am
64597c85: am
5bd6e14f: Don\'t try freeing resources on a different thread..
* commit '
687baab4ea05e1a5569edfe9224a705f285d5afd':
Don't try freeing resources on a different thread..
Ruben Brunk [Tue, 2 Apr 2013 18:03:38 +0000 (11:03 -0700)]
am
8ef3622e: am
890ebeb0: am
e7aa98e5: Changed editor back button behavior.
* commit '
8ef3622e8e3dfed4a0ddf6b26b3603c4823b3a1d':
Changed editor back button behavior.
Ruben Brunk [Tue, 2 Apr 2013 18:03:37 +0000 (11:03 -0700)]
am
83f44a35: am
dd9a6fb6: am
902a6f7f: Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
* commit '
83f44a3534583cc9900dc3804e028cc11a56adca':
Change panels organization. Also fixes border updates handling.
Michael Kolb [Tue, 2 Apr 2013 18:03:37 +0000 (11:03 -0700)]
am
c93dc7b6: am
63d9e873: am
fa3b121e: Merge "Pie design update" into gb-ub-photos-bryce
* commit '
c93dc7b61af4fa41070abfb7c61eff39c54710aa':
Pie design update
Angus Kong [Tue, 2 Apr 2013 18:03:36 +0000 (11:03 -0700)]
am
58cf8871: am
b4edf5b3: am
ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
* commit '
58cf88713ce6e006ace8ce91e8fe7214a0c54f6f':
Handle InterruptedException in waitDone
Ruben Brunk [Tue, 2 Apr 2013 18:03:36 +0000 (11:03 -0700)]
am
a1dfc07a: am
65ef29f9: am
0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
* commit '
a1dfc07a0ae2dbfea570617954d3b5853d8b8bcd':
Added apply UI callbacks for rotate/mirror operations.
Angus Kong [Tue, 2 Apr 2013 18:03:35 +0000 (11:03 -0700)]
am
11854b43: am
07abb731: am
36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce
* commit '
11854b435f54c8cd6191c245a76c465f0d29ff03':
Don't use SynchronousQueue to pass results.
Bobby Georgescu [Tue, 2 Apr 2013 18:03:35 +0000 (11:03 -0700)]
am
b1436075: am
adde6e72: am
8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
* commit '
b1436075172ca51e3181f4aae7385775cb6ccb76':
Usage statistics for camera settings
Bobby Georgescu [Tue, 2 Apr 2013 18:03:34 +0000 (11:03 -0700)]
am
8e841e91: am
36f54901: am
6058af44: Enforce bmp type in pool, handle MTP image decode failure
* commit '
8e841e9125e78f8c8f8c07979c2838cccdf3ca62':
Enforce bmp type in pool, handle MTP image decode failure
Bobby Georgescu [Mon, 1 Apr 2013 22:33:17 +0000 (15:33 -0700)]
Usage statistics for photo and video capture
Bug:
8433834
Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
The Android Automerger [Tue, 2 Apr 2013 16:19:08 +0000 (09:19 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 15:39:42 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia460e8a06b1d068077f52c35c045ad7325e78470
nicolasroard [Tue, 2 Apr 2013 15:24:44 +0000 (08:24 -0700)]
am
b1c06b88: am
20eb41f8: Fix stickiness issues with UI
* commit '
b1c06b881abcfff66951173819d73faaf0e40005':
Fix stickiness issues with UI
nicolasroard [Tue, 2 Apr 2013 15:24:43 +0000 (08:24 -0700)]
am
64597c85: am
5bd6e14f: Don\'t try freeing resources on a different thread..
* commit '
64597c85ddfcc3800c81e1738c9a7b75649a0ae9':
Don't try freeing resources on a different thread..
Ruben Brunk [Tue, 2 Apr 2013 15:24:35 +0000 (08:24 -0700)]
am
890ebeb0: am
e7aa98e5: Changed editor back button behavior.
* commit '
890ebeb0a7af5f804f6ae567f0e10d2b7323626f':
Changed editor back button behavior.
Ruben Brunk [Tue, 2 Apr 2013 15:24:17 +0000 (08:24 -0700)]
am
dd9a6fb6: am
902a6f7f: Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
* commit '
dd9a6fb653d3dbb0238d7436087dc7bce8a9f00d':
Change panels organization. Also fixes border updates handling.
OSDN Git Service
